svn commit: r912278 - in /ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string: FlexibleStringExpander.java test/FlexibleStringExpanderTests.java

[doogie-3]

Author: doogie
Date: Sun Feb 21 01:30:27 2010
New Revision: 912278

URL: http://svn.apache.org/viewvc?rev=912278&view=rev
Log:
BUG FIX: During static expansion, if the context was null, then the
passed expression would be returned.  This is not what would occur if
you called getInstance(null), as that always returns an FSE that expands
to "".  So, fix static expansion to return "" if the expression is null.

Modified:
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java

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=912278&r1=912277&r2=912278&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 Sun Feb 21 01:30:27 2010
@@ -113,7 +113,10 @@
      * @return The original expression's evaluation result as a <code>String</code>
      */
     public static String expandString(String expression, Map<String, ? extends Object> context, TimeZone timeZone, Locale locale) {
-        if (context == null || expression == null || !expression.contains(openBracket)) {
+        if (expression == null) {
+            return "";
+        }
+        if (context == null || !expression.contains(openBracket)) {
             return expression;
         }
         FlexibleStringExpander fse = FlexibleStringExpander.getInstance(expression);

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java?rev=912278&r1=912277&r2=912278&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java Sun Feb 21 01:30:27 2010
@@ -37,6 +37,7 @@
         FlexibleStringExpander fse = FlexibleStringExpander.getInstance(input);
         assertEquals(label, compare, fse.expandString(context));
         assertEquals("isEmpty:" + label, isEmpty, fse.isEmpty());
+        assertEquals("static:" + label, compare, FlexibleStringExpander.expandString(input, context));
     }
 
     public void testFlexibleStringExpander() {