You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/10/05 09:16:43 UTC
svn commit: r1394389 - in /camel/branches/camel-2.10.x: ./
camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
Author: davsclaus
Date: Fri Oct 5 07:16:43 2012
New Revision: 1394389
URL: http://svn.apache.org/viewvc?rev=1394389&view=rev
Log:
Fixed possible NPE
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1394388
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java?rev=1394389&r1=1394388&r2=1394389&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java (original)
+++ camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java Fri Oct 5 07:16:43 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());
}
}