cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1397557 - /cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java
Date Fri, 12 Oct 2012 13:16:28 GMT
Author: coheigea
Date: Fri Oct 12 13:16:28 2012
New Revision: 1397557

URL: http://svn.apache.org/viewvc?rev=1397557&view=rev
Log:
Merged revisions 1397553 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1397553 | coheigea | 2012-10-12 14:06:40 +0100 (Fri, 12 Oct 2012) | 2 lines

  Backporting specific fix

........

Modified:
    cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java

Modified: cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java?rev=1397557&r1=1397556&r2=1397557&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java
(original)
+++ cxf/branches/2.5.x-fixes/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java
Fri Oct 12 13:16:28 2012
@@ -251,7 +251,9 @@ public abstract class AbstractNotificati
             throw new SubscribeCreationFailedFault("Unable to register new endpoint", fault,
e);
         } finally {
             if (!success && subscription != null) {
-                subscriptions.remove(subscription);
+                if (subscription.getAddress() != null) {
+                    subscriptions.remove(subscription.getAddress());
+                }
                 try {
                     subscription.unsubscribe();
                 } catch (UnableToDestroySubscriptionFault e) {



Mime
View raw message