svn commit: r381432 - in head/www/aws: . files

[John Marino]

Author: marino
Date: Mon Mar 16 19:01:40 2015
New Revision: 381432
URL: https://svnweb.freebsd.org/changeset/ports/381432
QAT: https://qat.redports.org/buildarchive/r381432/

Log:
  www/aws: Fix dispatcher-timer bug discovered by gcc5-aux

Added:
  head/www/aws/files/patch-src_extended_aws-services-dispatchers-timer.adb   (contents, props changed)
Modified:
  head/www/aws/Makefile

Modified: head/www/aws/Makefile
==============================================================================
--- head/www/aws/Makefile	Mon Mar 16 18:53:10 2015	(r381431)
+++ head/www/aws/Makefile	Mon Mar 16 19:01:40 2015	(r381432)
@@ -3,7 +3,7 @@
 
 PORTNAME=	aws
 PORTVERSION=	3.2.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 

Added: head/www/aws/files/patch-src_extended_aws-services-dispatchers-timer.adb
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/aws/files/patch-src_extended_aws-services-dispatchers-timer.adb	Mon Mar 16 19:01:40 2015	(r381432)
@@ -0,0 +1,37 @@
+--- src/extended/aws-services-dispatchers-timer.adb.orig	2014-05-15 19:48:07 UTC
++++ src/extended/aws-services-dispatchers-timer.adb
+@@ -480,7 +480,11 @@ package body AWS.Services.Dispatchers.Ti
+ 
+    procedure Unregister
+      (Dispatcher : in out Handler;
+-      Name       : String) is
++      Name       : String)
++   is
++      use type Period_Table.Cursor;
++      
++      Pos : Period_table.Cursor := Period_Table.No_Element;
+    begin
+       for Cursor in Dispatcher.Table.Iterate loop
+          declare
+@@ -488,13 +492,18 @@ package body AWS.Services.Dispatchers.Ti
+          begin
+             if To_String (Item.Name) = Name then
+                Unchecked_Free (Item);
+-               Period_Table.Delete (Dispatcher.Table, Cursor);
+-               return;
++               Pos := Cursor;
++               exit;
+             end if;
+          end;
+       end loop;
+ 
+-      raise Constraint_Error with "Timer distpatcher " & Name & " not found";
++      if Pos = Period_Table.No_Element then
++         raise Constraint_Error
++           with "Timer distpatcher " & Name & " not found";
++      else
++         Period_Table.Delete (Dispatcher.Table, Pos);
++      end if;
+    end Unregister;
+ 
+    ------------