svn commit: r912286 - /ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java

[doogie-3]

Author: doogie
Date: Sun Feb 21 01:34:47 2010
New Revision: 912286

URL: http://svn.apache.org/viewvc?rev=912286&view=rev
Log:
Remove dead code.  At this point, FSE has full test coverage.

Modified:
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.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=912286&r1=912285&r2=912286&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:34:47 2010
@@ -37,7 +37,6 @@
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.cache.UtilCache;
-import org.codehaus.groovy.control.CompilationFailedException;
 import org.codehaus.groovy.runtime.InvokerHelper;
 
 import bsh.EvalError;
@@ -196,9 +195,6 @@
      * instances
      */
     protected static FlexibleStringExpander[] getStrElems(char[] chars, int offset, int length) {
-        if (length == 0) {
-            return null;
-        }
         String expression = new String(chars, 0, length + offset);
         int start = expression.indexOf(openBracket, offset);
         if (start == -1) {
@@ -368,7 +364,7 @@
      * or <code>null</code>
      */
     public boolean isEmpty() {
-        return this.chars == null || this.length == 0;
+        return this.length == 0;
     }
 
     /** Returns a copy of the original expression.
@@ -490,8 +486,6 @@
                         Debug.logVerbose("Groovy scriptlet evaluated to null [" + this + "], got no return so inserting nothing.", module);
                     }
                 }
-            } catch (CompilationFailedException e) {
-                Debug.logWarning(e, "Error evaluating Groovy scriptlet [" + this + "], inserting nothing; error was: " + e, module);
             } catch (Exception e) {
                 // handle other things, like the groovy.lang.MissingPropertyException
                 Debug.logWarning(e, "Error evaluating Groovy scriptlet [" + this + "], inserting nothing; error was: " + e, module);