Author: davsclaus
Date: Sun Jul 6 02:46:18 2008
New Revision: 674278
URL: http://svn.apache.org/viewvc?rev=674278&view=rev
Log:
CAMEL-675: Avoid NPE for interceptors using predicate and stop(). Added more
unit tests, and one of them is still failing - see CAMEL-676
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java?rev=674278&r1=674277&r2=674278&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
Sun Jul 6 02:46:18 2008
@@ -45,8 +45,8 @@
for (FilterProcessor filterProcessor : filters) {
Predicate<Exchange> predicate = filterProcessor.getPredicate();
if (predicate != null && predicate.matches(exchange)) {
- // process next will also take care (has not null test) if
next was a stop()
- // and this not a processor if so there is no processer to
execute
+ // process next will also take care (has not null test) if
next was a stop().
+ // stop() has no processor to execute, and thus we will end in
a NPE
filterProcessor.processNext(exchange);
return;
}
