Author: davsclaus
Date: Tue Nov 24 07:13:44 2009
New Revision: 883610
URL: http://svn.apache.org/viewvc?rev=883610&view=rev
Log:
Fixed potential NPE
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/UseLatestAggregationStrategy.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/UseLatestAggregationStrategy.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/UseLatestAggregationStrategy.java?rev=883610&r1=883609&r2=883610&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/UseLatestAggregationStrategy.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/UseLatestAggregationStrategy.java
Tue Nov 24 07:13:44 2009
@@ -36,7 +36,7 @@
if (oldExchange == null) {
return newExchange.getException();
} else {
- return newExchange.getException() != null
+ return (newExchange != null && newExchange.getException() != null)
? newExchange.getException()
: oldExchange.getException();
}