svn commit: r1170662 - in /servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component: WSNComponent.java WSNEndpoint.java

[gertv]

Author: gertv
Date: Wed Sep 14 14:52:00 2011
New Revision: 1170662

URL: http://svn.apache.org/viewvc?rev=1170662&view=rev
Log:
SMXCOMP-903: Wait for pending exchanges to get done before unregistering 
subscription endpoint

Modified:
    
servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNComponent.java
    
servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNEndpoint.java

Modified: 
servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNComponent.java
URL: 
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNComponent.java?rev=1170662&r1=1170661&r2=1170662&view=diff
==============================================================================
--- 
servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNComponent.java
 (original)
+++ 
servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNComponent.java
 Wed Sep 14 14:52:00 2011
@@ -292,6 +292,8 @@ public class WSNComponent extends Defaul
                 public void run() {
                     try {
                         Endpoint ep = (Endpoint) endpoint;
+                        // let's wait for pending exchanges to be done before 
actually removing the endpoint
+                        WSNComponent.this.prepareShutdown(ep);
                         WSNComponent.this.removeEndpoint(ep);
                     } catch (Exception e) {
                         logger.error("Unable to deactivate endpoint", e);

Modified: 
servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNEndpoint.java
URL: 
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNEndpoint.java?rev=1170662&r1=1170661&r2=1170662&view=diff
==============================================================================
--- 
servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNEndpoint.java
 (original)
+++ 
servicemix/components/trunk/engines/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/component/WSNEndpoint.java
 Wed Sep 14 14:52:00 2011
@@ -217,7 +217,7 @@ public class WSNEndpoint extends Provide
                 JbiWrapperHelper.wrap(doc);
             }
             msg.setContent(new DOMSource(doc));
-            sendSync(exchange);
+            send(exchange);
         }
     }