Repository: camel Updated Branches: refs/heads/master 6ed7f2cec -> 1fabfd590
CAMEL-10544: Polish Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1fabfd59 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1fabfd59 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1fabfd59 Branch: refs/heads/master Commit: 1fabfd5906b860ffa9667ff72c8a4648a047ca56 Parents: 6ed7f2c Author: Babak Vahdat <bvah...@apache.org> Authored: Wed May 17 22:10:00 2017 +0200 Committer: Babak Vahdat <bvah...@apache.org> Committed: Wed May 17 22:10:00 2017 +0200 ---------------------------------------------------------------------- .../apache/camel/component/xmpp/XmppPrivateChatProducer.java | 6 +++--- .../apache/camel/component/xmpp/XmppRobustConnectionTest.java | 6 ------ 2 files changed, 3 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/1fabfd59/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java index d09baa5..3701f79 100644 --- a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java +++ b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java @@ -96,7 +96,7 @@ public class XmppPrivateChatProducer extends DefaultProducer { } private Chat getOrCreateChat(ChatManager chatManager, final String participant, String thread) throws XmppStringprepException { - // this starts a new chat or retrieves the existing one in a threadsafe manner + // this starts a new chat or retrieves the pre-existing one in a threadsafe manner return chatManager.chatWith(JidCreate.entityBareFrom(participant + "@" + thread)); } @@ -116,9 +116,9 @@ public class XmppPrivateChatProducer extends DefaultProducer { connection = endpoint.createConnection(); } catch (SmackException e) { if (endpoint.isTestConnectionOnStartup()) { - throw new RuntimeException("Could not establish connection to XMPP server: " + endpoint.getConnectionDescription(), e); + throw new RuntimeException("Could not establish connection to XMPP server: " + endpoint.getConnectionDescription(), e); } else { - LOG.warn("Could not connect to XMPP server. {} Producer will attempt lazy connection when needed.", e.getMessage()); + LOG.warn("Could not connect to XMPP server: {} Producer will attempt lazy connection when needed.", e.getMessage()); } } } http://git-wip-us.apache.org/repos/asf/camel/blob/1fabfd59/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java ---------------------------------------------------------------------- diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java index afa1a9e..27a40a5 100644 --- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java +++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRobustConnectionTest.java @@ -30,12 +30,6 @@ import org.junit.Test; */ public class XmppRobustConnectionTest extends CamelTestSupport { - - @Override - public void doPreSetup() throws Exception { - ReconnectionManager.setEnabledPerDefault(true); - } - @Override protected JndiRegistry createRegistry() throws Exception { JndiRegistry registry = super.createRegistry();
