Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3155777E2 for ; Thu, 14 Jul 2011 15:59:59 +0000 (UTC) Received: (qmail 6353 invoked by uid 500); 14 Jul 2011 15:59:59 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 6295 invoked by uid 500); 14 Jul 2011 15:59:58 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 6281 invoked by uid 99); 14 Jul 2011 15:59:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Jul 2011 15:59:57 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Jul 2011 15:59:57 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E42912388901 for ; Thu, 14 Jul 2011 15:59:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1146771 - /camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java Date: Thu, 14 Jul 2011 15:59:36 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110714155936.E42912388901@eris.apache.org> Author: davsclaus Date: Thu Jul 14 15:59:36 2011 New Revision: 1146771 URL: http://svn.apache.org/viewvc?rev=1146771&view=rev Log: Avoid potential NPE in createIterator if delimier is null 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=1146771&r1=1146770&r2=1146771&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 Thu Jul 14 15:59:36 2011 @@ -507,7 +507,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);