svn commit: r1394388 - /camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java

[davsclaus]

Author: davsclaus
Date: Fri Oct  5 07:14:31 2012
New Revision: 1394388

URL: http://svn.apache.org/viewvc?rev=1394388&view=rev
Log:
CAMEL-5682: Fixed possible NPE

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java?rev=1394388&r1=1394387&r2=1394388&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java 
(original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java 
Fri Oct  5 07:14:31 2012
@@ -656,7 +656,7 @@ public final class ObjectHelper {
         if (camelProperties != null) {
             for (Map.Entry<String, String> entry : camelProperties.entrySet()) 
{
                 String key = entry.getKey();
-                if (key.startsWith(prefix)) {
+                if (key != null && key.startsWith(prefix)) {
                     answer.put(key.substring(prefix.length()), 
entry.getValue());
                 }
             }