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 2012/12/14 12:46:30 UTC
svn commit: r1421805 - in /camel/branches/camel-2.9.x: ./
camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
tests/camel-itest/src/test/java/org/apache/camel/itest/issues/AdviceWithWeaveFirstLastTest.java
Author: ningjiang
Date: Fri Dec 14 11:46:28 2012
New Revision: 1421805
URL: http://svn.apache.org/viewvc?rev=1421805&view=rev
Log:
CAMEL-5875 Fixed the weaveFirst/weaveLast not working issue before the camel context is started
Merged revisions 1421769 via svnmerge from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
................
r1421769 | ningjiang | 2012-12-14 17:51:42 +0800 (Fri, 14 Dec 2012) | 10 lines
Merged revisions 1421764 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1421764 | ningjiang | 2012-12-14 17:29:28 +0800 (Fri, 14 Dec 2012) | 1 line
CAMEL-5875 Fixed the weaveFirst/weaveLast not working issue before the camel context is started
........
................
Added:
camel/branches/camel-2.9.x/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/AdviceWithWeaveFirstLastTest.java
- copied unchanged from r1421769, camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/AdviceWithWeaveFirstLastTest.java
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1421764
Merged /camel/branches/camel-2.10.x:r1421769
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java?rev=1421805&r1=1421804&r2=1421805&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java Fri Dec 14 11:46:28 2012
@@ -66,6 +66,10 @@ public final class AdviceWithTasks {
}
public boolean match(ProcessorDefinition processor) {
+ if (id.equals("*")) {
+ // make sure the processor which id isn't be set is matched.
+ return true;
+ }
return EndpointHelper.matchPattern(processor.getId(), id);
}
}