svn commit: r1067240 - in /camel/trunk/components/camel-smpp/src: main/java/org/apache/camel/component/smpp/ test/java/org/apache/camel/component/smpp/

[cmueller]

Author: cmueller
Date: Fri Feb  4 17:48:43 2011
New Revision: 1067240

URL: http://svn.apache.org/viewvc?rev=1067240&view=rev
Log:
CAMEL-3624: camel-smpp should unbind from SMSC before diconnecting

Modified:
    
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java
    
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java
    
camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java
    
camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java

Modified: 
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java?rev=1067240&r1=1067239&r2=1067240&view=diff
==============================================================================
--- 
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java
 (original)
+++ 
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java
 Fri Feb  4 17:48:43 2011
@@ -192,7 +192,7 @@ public class SmppConsumer extends Defaul
     private void closeSession(SMPPSession session) {
         if (session != null) {
             session.removeSessionStateListener(this.sessionStateListener);
-            session.close();
+            session.unbindAndClose();
             session = null;
         }
     }

Modified: 
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java?rev=1067240&r1=1067239&r2=1067240&view=diff
==============================================================================
--- 
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java
 (original)
+++ 
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java
 Fri Feb  4 17:48:43 2011
@@ -179,7 +179,7 @@ public class SmppProducer extends Defaul
     private void closeSession(SMPPSession session) {
         if (session != null) {
             session.removeSessionStateListener(this.sessionStateListener);
-            session.close();
+            session.unbindAndClose();
             session = null;
         }
     }

Modified: 
camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java?rev=1067240&r1=1067239&r2=1067240&view=diff
==============================================================================
--- 
camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java
 (original)
+++ 
camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java
 Fri Feb  4 17:48:43 2011
@@ -113,7 +113,7 @@ public class SmppConsumerTest {
             .andReturn("smpp://smppclient@localhost:2775")
             .times(3);
         session.removeSessionStateListener(isA(SessionStateListener.class));
-        session.close();
+        session.unbindAndClose();
         
         replay(session, endpoint);
         

Modified: 
camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java?rev=1067240&r1=1067239&r2=1067240&view=diff
==============================================================================
--- 
camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java
 (original)
+++ 
camel/trunk/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppProducerTest.java
 Fri Feb  4 17:48:43 2011
@@ -144,7 +144,7 @@ public class SmppProducerTest {
             .andReturn("smpp://smppclient@localhost:2775")
             .times(2);
         session.removeSessionStateListener(isA(SessionStateListener.class));
-        session.close();
+        session.unbindAndClose();
         expect(endpoint.getConnectionString())
             .andReturn("smpp://smppclient@localhost:2775");