svn commit: r1394390 - in /camel/branches/camel-2.9.x: ./ camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java

[davsclaus]

Author: davsclaus
Date: Fri Oct  5 07:18:03 2012
New Revision: 1394390

URL: http://svn.apache.org/viewvc?rev=1394390&view=rev
Log:
Fixed possible NPE

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1394388
  Merged /camel/branches/camel-2.10.x:r1394389

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java?rev=1394390&r1=1394389&r2=1394390&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
 (original)
+++ 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
 Fri Oct  5 07:18:03 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());
                 }
             }