svn commit: r772735 - /ofbiz/trunk/framework/base/src/org/ofbiz/base/util/BshUtil.java

[adrianc]

Author: adrianc
Date: Thu May  7 18:15:39 2009
New Revision: 772735

URL: http://svn.apache.org/viewvc?rev=772735&view=rev
Log:
Reverted one of my changes that is no longer needed.

I apologize for the repository thrash. I made the mistake of adding the apostrophe to quote substitution at the last minute without fully testing it. I'll try not to do that again.

Modified:
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/BshUtil.java

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/BshUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/BshUtil.java?rev=772735&r1=772734&r2=772735&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/BshUtil.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/BshUtil.java Thu May  7 18:15:39 2009
@@ -25,7 +25,9 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
+import java.util.Set;
 
 import org.ofbiz.base.location.FlexibleLocation;
 import org.ofbiz.base.util.cache.UtilCache;
@@ -51,7 +53,6 @@
      * Evaluate a BSH condition or expression
      * @param expression The expression to evaluate
      * @param context The context to use in evaluation (re-written)
-     * @see <a href="StringUtil.html#convertOperatorSubstitutions(java.lang.String)">StringUtil.convertOperatorSubstitutions(java.lang.String)</a>
      * @return Object The result of the evaluation
      * @throws EvalError
      */
@@ -61,17 +62,19 @@
             Debug.logError("BSH Evaluation error. Empty expression", module);
             return null;
         }
-        if (Debug.verboseOn()) {
+
+        if (Debug.verboseOn())
             Debug.logVerbose("Evaluating -- " + expression, module);
+        if (Debug.verboseOn())
             Debug.logVerbose("Using Context -- " + context, module);
-        }
+
         try {
             Interpreter bsh = makeInterpreter(context);
             // evaluate the expression
-            o = bsh.eval(StringUtil.convertOperatorSubstitutions(expression));
-            if (Debug.verboseOn()) {
+            o = bsh.eval(expression);
+            if (Debug.verboseOn())
                 Debug.logVerbose("Evaluated to -- " + o, module);
-            }
+
             // read back the context info
             NameSpace ns = bsh.getNameSpace();
             String[] varNames = ns.getVariableNames();