commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1210155 - /commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl2/JexlEngine.java
Date Sun, 04 Dec 2011 17:44:13 GMT
Author: sebb
Date: Sun Dec  4 17:44:12 2011
New Revision: 1210155

URL: http://svn.apache.org/viewvc?rev=1210155&view=rev
Log:
Restore binary compatibility

Modified:
    commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl2/JexlEngine.java

Modified: commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl2/JexlEngine.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl2/JexlEngine.java?rev=1210155&r1=1210154&r2=1210155&view=diff
==============================================================================
--- commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl2/JexlEngine.java
(original)
+++ commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl2/JexlEngine.java
Sun Dec  4 17:44:12 2011
@@ -1225,7 +1225,7 @@ public class JexlEngine {
     protected ASTJexlScript parse(CharSequence expression, JexlInfo info, Scope frame) {
         String expr = cleanExpression(expression);
         ASTJexlScript script = null;
-        DebugInfo dbgInfo = null;
+        JexlInfo dbgInfo = null;
         synchronized (parser) {
             if (cache != null) {
                 script = cache.get(expr);
@@ -1241,8 +1241,6 @@ public class JexlEngine {
                 // use first calling method of JexlEngine as debug info
                 if (info == null) {
                     dbgInfo = debugInfo();
-                } else if (info instanceof DebugInfo) {
-                    dbgInfo = (DebugInfo) info;
                 } else {
                     dbgInfo = info.debugInfo();
                 }
@@ -1274,7 +1272,7 @@ public class JexlEngine {
      * @param c column number
      * @return a JexlInfo instance
      */
-    protected DebugInfo createInfo(String fn, int l, int c) {
+    protected JexlInfo createInfo(String fn, int l, int c) {
         return new DebugInfo(fn, l, c);
     }
 
@@ -1284,7 +1282,7 @@ public class JexlEngine {
      * not owned by JexlEngine, UnifiedJEXL or {Script,Expression}Factory.</p>
      * @return an Info if debug is set, null otherwise
      */
-    protected DebugInfo debugInfo() {
+    protected JexlInfo debugInfo() {
         DebugInfo info = null;
         if (debug) {
             Throwable xinfo = new Throwable();
@@ -1307,7 +1305,7 @@ public class JexlEngine {
                 }
             }
             if (se != null) {
-                info = createInfo(se.getClassName() + "." + se.getMethodName(), se.getLineNumber(),
0);
+                info = createInfo(se.getClassName() + "." + se.getMethodName(), se.getLineNumber(),
0).debugInfo();
             }
         }
         return info;



Mime
View raw message