camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hadr...@apache.org
Subject svn commit: r1234595 - in /camel/branches/camel-2.8.x: ./ camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java components/camel-http/
Date Sun, 22 Jan 2012 20:25:00 GMT
Author: hadrian
Date: Sun Jan 22 20:24:59 2012
New Revision: 1234595

URL: http://svn.apache.org/viewvc?rev=1234595&view=rev
Log:
Content based router - Only set otherwise processor if given

Modified:
    camel/branches/camel-2.8.x/   (props changed)
    camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
    camel/branches/camel-2.8.x/components/camel-http/   (props changed)

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 22 20:24:59 2012
@@ -1,2 +1,2 @@
 /camel/branches/camel-2.9.x:1227549,1228229,1229567,1234054
-/camel/trunk:1227540,1228223,1229565,1234043
+/camel/trunk:1226860,1227540,1228223,1229565,1234043

Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java?rev=1234595&r1=1234594&r2=1234595&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
(original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
Sun Jan 22 20:24:59 2012
@@ -46,7 +46,7 @@ public class ChoiceProcessor extends Ser
 
     public ChoiceProcessor(List<FilterProcessor> filters, Processor otherwise) {
         this.filters = filters;
-        this.otherwise = AsyncProcessorTypeConverter.convert(otherwise);
+        this.otherwise = otherwise != null ? AsyncProcessorTypeConverter.convert(otherwise)
: null;
     }
 
     public void process(Exchange exchange) throws Exception {

Propchange: camel/branches/camel-2.8.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 22 20:24:59 2012
@@ -1,2 +1,2 @@
 /camel/branches/camel-2.9.x/components/camel-http:1234054
-/camel/trunk/components/camel-http:1228223,1234043
+/camel/trunk/components/camel-http:1226860,1228223,1234043



Mime
View raw message