r58669 - in /branches/upstream/libnet-stomp-perl/current: CHANGES META.yml Makefile.PL lib/Net/Stomp.pm

[ansgar-guest at users.alioth.debian.org]

Author: ansgar-guest
Date: Mon May 31 04:29:28 2010
New Revision: 58669

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=58669
Log:
[svn-upgrade] Integrating new upstream version, libnet-stomp-perl (0.36)

Modified:
    branches/upstream/libnet-stomp-perl/current/CHANGES
    branches/upstream/libnet-stomp-perl/current/META.yml
    branches/upstream/libnet-stomp-perl/current/Makefile.PL
    branches/upstream/libnet-stomp-perl/current/lib/Net/Stomp.pm

Modified: branches/upstream/libnet-stomp-perl/current/CHANGES
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-stomp-perl/current/CHANGES?rev=58669&op=diff
==============================================================================
--- branches/upstream/libnet-stomp-perl/current/CHANGES (original)
+++ branches/upstream/libnet-stomp-perl/current/CHANGES Mon May 31 04:29:28 2010
@@ -1,4 +1,8 @@
 Revision history for Perl module Net::Stomp:
+
+0.36 Fri May 28 16:20::15 BST 2010
+  - Fix behaviour regression on constructor - 0.35 would look at ->new time if
+    no server could be reached. We now die after trying each server once.
 
 0.35 Tue May 25 15:55:36 BST 2010
   - add some examples

Modified: branches/upstream/libnet-stomp-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-stomp-perl/current/META.yml?rev=58669&op=diff
==============================================================================
--- branches/upstream/libnet-stomp-perl/current/META.yml (original)
+++ branches/upstream/libnet-stomp-perl/current/META.yml Mon May 31 04:29:28 2010
@@ -4,7 +4,7 @@
   - "Leon Brocard <acme at astray.com>.\nThom May <thom.may at betfair.com>.\nAsh Berlin <ash_github at firemirror.com>."
 configure_requires:
   Module::Build: 0.36
-generated_by: 'Module::Build version 0.3603'
+generated_by: 'Module::Build version 0.3607'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -13,7 +13,7 @@
 provides:
   Net::Stomp:
     file: lib/Net/Stomp.pm
-    version: 0.35
+    version: 0.36
   Net::Stomp::Frame:
     file: lib/Net/Stomp/Frame.pm
 requires:
@@ -22,4 +22,4 @@
   IO::Socket::INET: 0
 resources:
   license: http://dev.perl.org/licenses/
-version: 0.35
+version: 0.36

Modified: branches/upstream/libnet-stomp-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-stomp-perl/current/Makefile.PL?rev=58669&op=diff
==============================================================================
--- branches/upstream/libnet-stomp-perl/current/Makefile.PL (original)
+++ branches/upstream/libnet-stomp-perl/current/Makefile.PL Mon May 31 04:29:28 2010
@@ -1,4 +1,4 @@
-# Note: this file was auto-generated by Module::Build::Compat version 0.3603
+# Note: this file was auto-generated by Module::Build::Compat version 0.3607
 use ExtUtils::MakeMaker;
 WriteMakefile
 (

Modified: branches/upstream/libnet-stomp-perl/current/lib/Net/Stomp.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-stomp-perl/current/lib/Net/Stomp.pm?rev=58669&op=diff
==============================================================================
--- branches/upstream/libnet-stomp-perl/current/lib/Net/Stomp.pm (original)
+++ branches/upstream/libnet-stomp-perl/current/lib/Net/Stomp.pm Mon May 31 04:29:28 2010
@@ -6,7 +6,7 @@
 use Net::Stomp::Frame;
 use Carp;
 use base 'Class::Accessor::Fast';
-our $VERSION = '0.35';
+our $VERSION = '0.36';
 __PACKAGE__->mk_accessors( qw(
     _cur_host failover hostname hosts port select serial session_id socket ssl
     ssl_options subscriptions _connect_headers
@@ -39,11 +39,22 @@
     }
     $self->hosts(@hosts);
 
-    eval { $self->_get_connection};
-    while($@) {
-        sleep(5);
-        eval { $self->_get_connection};
-    }
+    my $err;
+    {
+        local $@ = 'run me!';
+        while($@) {
+            eval { $self->_get_connection };
+            last unless $@;
+            if (!@hosts || $self->_cur_host == $#hosts ) {
+                # We've cycled through all setup hosts. Die now. Can't die because
+                # $@ is localized.
+                $err = $@;
+                last;
+            }
+            sleep(5);
+        }
+    }
+    die $err if $err;
     return $self;
 }