You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2010/11/11 12:57:41 UTC
svn commit: r1033904 -
/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java
Author: davsclaus
Date: Thu Nov 11 11:57:40 2010
New Revision: 1033904
URL: http://svn.apache.org/viewvc?rev=1033904&view=rev
Log:
CAMEL-3237: Applied patch by Jean. Thanks for the patch.
Modified:
camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java
Modified: camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java?rev=1033904&r1=1033903&r2=1033904&view=diff
==============================================================================
--- camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java (original)
+++ camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java Thu Nov 11 11:57:40 2010
@@ -150,7 +150,7 @@ public class XmppEndpoint extends Defaul
}
});
- if (login && !connection.isAuthenticated()) {
+ if (!connection.isAuthenticated()) {
if (user != null) {
if (LOG.isDebugEnabled()) {
LOG.debug("Logging in to XMPP as user: " + user + " on connection: " + getConnectionMessage(connection));
@@ -163,10 +163,12 @@ public class XmppEndpoint extends Defaul
AccountManager accountManager = new AccountManager(connection);
accountManager.createAccount(user, password);
}
- if (resource != null) {
- connection.login(user, password, resource);
- } else {
- connection.login(user, password);
+ if (login) {
+ if (resource != null) {
+ connection.login(user, password, resource);
+ } else {
+ connection.login(user, password);
+ }
}
} else {
if (LOG.isDebugEnabled()) {