Return-Path: Delivered-To: apmail-ofbiz-commits-archive@www.apache.org Received: (qmail 88594 invoked from network); 1 Mar 2010 07:52:10 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 1 Mar 2010 07:52:10 -0000 Received: (qmail 18372 invoked by uid 500); 1 Mar 2010 05:05:31 -0000 Delivered-To: apmail-ofbiz-commits-archive@ofbiz.apache.org Received: (qmail 18348 invoked by uid 500); 1 Mar 2010 05:05:31 -0000 Mailing-List: contact commits-help@ofbiz.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ofbiz.apache.org Delivered-To: mailing list commits@ofbiz.apache.org Received: (qmail 18330 invoked by uid 99); 1 Mar 2010 05:05:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Mar 2010 05:05:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Mon, 01 Mar 2010 05:05:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CF70723888D2; Mon, 1 Mar 2010 05:05:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r917373 - in /ofbiz/trunk/framework/base/src/org/ofbiz/base/util: ObjectType.java string/FlexibleStringExpander.java test/ObjectTypeTests.java Date: Mon, 01 Mar 2010 05:05:10 -0000 To: commits@ofbiz.apache.org From: doogie@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100301050510.CF70723888D2@eris.apache.org> Author: doogie Date: Mon Mar 1 05:05:10 2010 New Revision: 917373 URL: http://svn.apache.org/viewvc?rev=917373&view=rev Log: BUG FIX: If the object is a string and it is empty, return null early. Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java?rev=917373&r1=917372&r2=917373&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java Mon Mar 1 05:05:10 2010 @@ -484,6 +484,9 @@ return obj.toString(); } Class sourceClass = obj.getClass(); + if (obj instanceof String && UtilValidate.isEmpty(obj)) { + return null; + } Class targetClass = null; try { targetClass = loadClass(type); Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java?rev=917373&r1=917372&r2=917373&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java Mon Mar 1 05:05:10 2010 @@ -399,7 +399,8 @@ Object obj = get(context, timeZone, locale); StringBuilder buffer = new StringBuilder(this.hint); try { - if (obj != null) { + if (obj instanceof String && UtilValidate.isEmpty(obj)) { + } else if (obj != null) { buffer.append(ObjectType.simpleTypeConvert(obj, "String", null, timeZone, locale, true)); } } catch (Exception e) { Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java?rev=917373&r1=917372&r2=917373&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java Mon Mar 1 05:05:10 2010 @@ -198,7 +198,7 @@ public void testString() throws GeneralException, Exception { simpleTypeConvertTest("String->String", "one", "String", "one"); simpleTypeConvertTest("String->String", "one", "java.lang.String", "one"); - //BUG simpleTypeConvertTestSingleMulti("empty-String->anything", "", new String[] {"List", "Map"}, null); + simpleTypeConvertTestSingleMulti("empty-String->anything", "", new String[] {"List", "Map"}, null); //BUG simpleTypeConvertTestSingleMulti("empty-String->bad-class", "", new String[] {"no-class"}, null); simpleTypeConvertTestError("String->error", "one", new String[] {}); simpleTypeConvertTestMultiMulti("String->Boolean(true)", new String[] {"true", " true ", " TrUe"}, new String[] {"Boolean", "java.lang.Boolean"}, Boolean.TRUE);