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 2013/04/22 11:23:28 UTC
svn commit: r1470423 - in /camel/branches/camel-2.9.x: ./
camel-core/src/main/java/org/apache/camel/model/
camel-core/src/test/java/org/apache/camel/processor/
Author: davsclaus
Date: Mon Apr 22 09:23:25 2013
New Revision: 1470423
URL: http://svn.apache.org/r1470423
Log:
CAMEL-6298: Fixed setting id in Java DSL on no output types such as validate.
Added:
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/processor/ValidateIdTest.java
- copied unchanged from r1470421, camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/processor/ValidateIdTest.java
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1470420
Merged /camel/branches/camel-2.10.x:r1470421
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/model/NoOutputExpressionNode.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java?rev=1470423&r1=1470422&r2=1470423&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java Mon Apr 22 09:23:25 2013
@@ -68,4 +68,11 @@ public class NoOutputExpressionNode exte
getParent().addOutput(output);
}
+ @Override
+ public ExpressionNode id(String id) {
+ // let parent handle assigning the id, as we do not support outputs
+ getParent().id(id);
+ return this;
+ }
}
+
Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java?rev=1470423&r1=1470422&r2=1470423&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java Mon Apr 22 09:23:25 2013
@@ -989,7 +989,7 @@ public abstract class ProcessorDefinitio
*/
@SuppressWarnings("unchecked")
public Type id(String id) {
- if (getOutputs().isEmpty()) {
+ if (isOutputSupported() && getOutputs().isEmpty()) {
// set id on this
setId(id);
} else {