camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r883610 - /camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/UseLatestAggregationStrategy.java
Date Tue, 24 Nov 2009 07:13:44 GMT
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();
         }



Mime
View raw message