You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/05/14 03:56:36 UTC
[1/2] git commit: Fixes CAMEL-6819 Use exceptionHandler on Xmpp
Consumer
Repository: camel
Updated Branches:
refs/heads/master ff3c09e25 -> 273b57690
Fixes CAMEL-6819 Use exceptionHandler on Xmpp Consumer
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e61235bc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e61235bc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e61235bc
Branch: refs/heads/master
Commit: e61235bcab4d3924479f43e7ca41713465ec903d
Parents: ff3c09e
Author: ancosen <an...@gmail.com>
Authored: Tue May 13 22:57:28 2014 +0200
Committer: Willem Jiang <wi...@gmail.com>
Committed: Wed May 14 09:32:03 2014 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e61235bc/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
index e726543..fe5cbca 100644
--- a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
+++ b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
@@ -69,6 +69,7 @@ public class XmppConsumer extends DefaultConsumer implements PacketListener, Mes
throw new RuntimeException("Could not connect to XMPP server.", e);
} else {
LOG.warn(XmppEndpoint.getXmppExceptionLogMessage(e));
+ getExceptionHandler().handleException(XmppEndpoint.getXmppExceptionLogMessage(e),e);
scheduleDelayedStart();
return;
}
[2/2] git commit: CAMEL-6819 avoid the NPE when the ExceptionHandler
is not set
Posted by ni...@apache.org.
CAMEL-6819 avoid the NPE when the ExceptionHandler is not set
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/273b5769
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/273b5769
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/273b5769
Branch: refs/heads/master
Commit: 273b576906bfacecd073a374018fa2599212fe15
Parents: e61235b
Author: Willem Jiang <wi...@gmail.com>
Authored: Wed May 14 09:56:06 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Wed May 14 09:56:06 2014 +0800
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/xmpp/XmppConsumer.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/273b5769/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
index fe5cbca..657c504 100644
--- a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
+++ b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
@@ -69,7 +69,9 @@ public class XmppConsumer extends DefaultConsumer implements PacketListener, Mes
throw new RuntimeException("Could not connect to XMPP server.", e);
} else {
LOG.warn(XmppEndpoint.getXmppExceptionLogMessage(e));
- getExceptionHandler().handleException(XmppEndpoint.getXmppExceptionLogMessage(e),e);
+ if (getExceptionHandler() != null) {
+ getExceptionHandler().handleException(XmppEndpoint.getXmppExceptionLogMessage(e), e);
+ }
scheduleDelayedStart();
return;
}