You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2011/08/08 19:15:02 UTC
svn commit: r1155018 - in /camel/branches/camel-2.7.x: ./
camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
Author: dkulp
Date: Mon Aug 8 17:15:01 2011
New Revision: 1155018
URL: http://svn.apache.org/viewvc?rev=1155018&view=rev
Log:
Merged revisions 1146771 via svnmerge from
https://svn.apache.org/repos/asf/camel/branches/camel-2.8.x
........
r1146771 | davsclaus | 2011-07-14 11:59:36 -0400 (Thu, 14 Jul 2011) | 1 line
Avoid potential NPE in createIterator if delimier is null
........
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Aug 8 17:15:01 2011
@@ -1 +1 @@
-/camel/branches/camel-2.8.x:1-1146127,1146653
+/camel/branches/camel-2.8.x:1-1146127,1146653,1146771
Modified: camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java?rev=1155018&r1=1155017&r2=1155018&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java (original)
+++ camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java Mon Aug 8 17:15:01 2011
@@ -508,7 +508,7 @@ public final class ObjectHelper {
// this code is optimized to only use a Scanner if needed, eg there is a delimiter
- if (s.contains(delimiter)) {
+ if (delimiter != null && s.contains(delimiter)) {
// use a scanner if it contains the delimiter
Scanner scanner = new Scanner((String)value);
scanner.useDelimiter(delimiter);