Update jSMPP version, remove workaround, the reconnection and close deadlock are fixed.

Author: pmoerenhout

components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java

@@ -127,15 +127,9 @@ protected void doStop() throws Exception {
     private void closeSession() {
         if (session != null) {
             session.removeSessionStateListener(this.internalSessionStateListener);
-            // remove this hack after http://code.google.com/p/jsmpp/issues/detail?id=93 is fixed
-            try {
-                Thread.sleep(1000);
-                session.unbindAndClose();
-                // clear session as we closed it successfully
-                session = null;
-            } catch (Exception e) {
-                LOG.warn("Cannot close session due " + e.getMessage());
-            }
+            session.unbindAndClose();
+            // clear session as we closed it successfully
+            session = null;
         }
     }
 

components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java

@@ -166,13 +166,8 @@ protected void doStop() throws Exception {
     private void closeSession() {
         if (session != null) {
             session.removeSessionStateListener(this.internalSessionStateListener);
-            // remove this hack after http://code.google.com/p/jsmpp/issues/detail?id=93 is fixed
-            try {
-                Thread.sleep(1000);
-                session.unbindAndClose();
-            } catch (Exception e) {
-                LOG.warn("Could not close session " + session);
-            }
+            session.unbindAndClose();
+            // clear session as we closed it successfully
             session = null;
         }
     }

parent/pom.xml

@@ -351,7 +351,7 @@
     <!-- Upgrade to 1.7.26 causes stability issues. See CAMEL-10477 -->
     <jruby-version>1.7.18</jruby-version>
     <jsendnsca-version>1.3.1</jsendnsca-version>
-    <jsmpp-version>2.3.2</jsmpp-version>
+    <jsmpp-version>2.3.3</jsmpp-version>
     <jsch-version>0.1.54</jsch-version>
     <jsch-bundle-version>0.1.54_1</jsch-bundle-version>
     <jsendnsca-bundle-version>1.3.1_3</jsendnsca-bundle-version>