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 2008/11/07 07:16:45 UTC
svn commit: r712070 - in /activemq/camel/branches/camel-1.x: ./
camel-core/src/main/java/org/apache/camel/processor/HandleFaultProcessor.java
Author: ningjiang
Date: Thu Nov 6 22:16:44 2008
New Revision: 712070
URL: http://svn.apache.org/viewvc?rev=712070&view=rev
Log:
Merged revisions 712064 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r712064 | ningjiang | 2008-11-07 13:36:07 +0800 (Fri, 07 Nov 2008) | 1 line
CAMEL-1058 fixed the HandleFaultProcessor's bug
........
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/HandleFaultProcessor.java
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 6 22:16:44 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Nov 6 22:16:44 2008
@@ -1 +1 @@
-/activemq/camel/trunk:1-708421,708553-709447,709449-709612,709614-709634,709636-710013,711200,711206,711219-711220,711523,711531,711599,711655-711656,711756,711784,711859,711874,711962,711971
+/activemq/camel/trunk:1-708421,708553-709447,709449-709612,709614-709634,709636-710013,711200,711206,711219-711220,711523,711531,711599,711655-711656,711756,711784,711859,711874,711962,711971,712064
Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/HandleFaultProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/HandleFaultProcessor.java?rev=712070&r1=712069&r2=712070&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/HandleFaultProcessor.java (original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/HandleFaultProcessor.java Thu Nov 6 22:16:44 2008
@@ -46,7 +46,7 @@
return ((AsyncProcessor)processor).process(exchange, new AsyncCallback() {
public void done(boolean doneSynchronously) {
- callback.done(doneSynchronously);
+ // Take the fault message out before we keep on going
Message faultMessage = exchange.getFault(false);
if (faultMessage != null) {
final Object faultBody = faultMessage.getBody();
@@ -59,7 +59,8 @@
+ faultBody.getClass().getName() + ":\n" + faultBody));
}
}
- }
+ }
+ callback.done(doneSynchronously);
}
});
}