Repository: camel Updated Branches: refs/heads/master 119207325 -> a2209dcab
Update jSMPP version, remove workaround, the reconnection and close deadlock are fixed. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a2209dca Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a2209dca Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a2209dca Branch: refs/heads/master Commit: a2209dcab150df767141568731a477386d5eacdc Parents: 1192073 Author: Pim Moerenhout <pim.moerenh...@gmail.com> Authored: Thu Dec 15 10:21:45 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Dec 15 10:26:32 2016 +0100 ---------------------------------------------------------------------- .../org/apache/camel/component/smpp/SmppConsumer.java | 12 +++--------- .../org/apache/camel/component/smpp/SmppProducer.java | 9 ++------- parent/pom.xml | 2 +- 3 files changed, 6 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a2209dca/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java index 6be353a..ee1f5eb 100644 --- a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java +++ b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java @@ -127,15 +127,9 @@ public class SmppConsumer extends DefaultConsumer { 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; } } http://git-wip-us.apache.org/repos/asf/camel/blob/a2209dca/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java index f8acdda..7e1e927 100644 --- a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java +++ b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java @@ -166,13 +166,8 @@ public class SmppProducer extends DefaultProducer { 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; } } http://git-wip-us.apache.org/repos/asf/camel/blob/a2209dca/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 1cae95a..1342113 100644 --- a/parent/pom.xml +++ b/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>
