Merge fix for #193 into brach 3.2.x

Author: emacarron

src/main/java/org/apache/ibatis/scripting/xmltags/OgnlCache.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2012 the original author or authors.
+ *    Copyright 2009-2014 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -16,54 +16,45 @@
 
 package org.apache.ibatis.scripting.xmltags;
 
-import java.io.StringReader;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import ognl.ExpressionSyntaxException;
-import ognl.Node;
 import ognl.Ognl;
 import ognl.OgnlException;
-import ognl.OgnlParser;
-import ognl.ParseException;
-import ognl.TokenMgrError;
 
 import org.apache.ibatis.builder.BuilderException;
 
 /**
- * 
- * Caches OGNL parsed expressions. Have a look at
- * http://code.google.com/p/mybatis/issues/detail?id=342
- * 
- */
-/**
- * @author Clinton Begin
+ * Caches OGNL parsed expressions.
+ *  
+ * @see http://code.google.com/p/mybatis/issues/detail?id=342
+ *
+ * @author Eduardo Macarron
  */
-public class OgnlCache {
+public final class OgnlCache {
 
-  private static final Map<String, ognl.Node> expressionCache = new ConcurrentHashMap<String, ognl.Node>();
+  private static final Map<String, Object> expressionCache = new ConcurrentHashMap<String, Object>();
+
+  private OgnlCache() {
+    // Prevent Instantiation of Static Class
+  }
 
   public static Object getValue(String expression, Object root) {
     try {
-      return Ognl.getValue(parseExpression(expression), root);
+      Map<Object, OgnlClassResolver> context = Ognl.createDefaultContext(root, new OgnlClassResolver());
+      return Ognl.getValue(parseExpression(expression), context, root);
     } catch (OgnlException e) {
       throw new BuilderException("Error evaluating expression '" + expression + "'. Cause: " + e, e);
     }
   }
 
   private static Object parseExpression(String expression) throws OgnlException {
-    try {
-      Node node = expressionCache.get(expression);
-      if (node == null) {
-        node = new OgnlParser(new StringReader(expression)).topLevelExpression();
-        expressionCache.put(expression, node);
-      }
-      return node;
-    } catch (ParseException e) {
-      throw new ExpressionSyntaxException(expression, e);
-    } catch (TokenMgrError e) {
-      throw new ExpressionSyntaxException(expression, e);
+    Object node = expressionCache.get(expression);
+    if (node == null) {
+      node = Ognl.parseExpression(expression);
+      expressionCache.put(expression, node);
     }
+    return node;
   }
 
 }

src/main/java/org/apache/ibatis/scripting/xmltags/OgnlClassResolver.java

@@ -0,0 +1,57 @@
+/*
+ *    Copyright 2014 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package org.apache.ibatis.scripting.xmltags;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import ognl.ClassResolver;
+
+import org.apache.ibatis.io.Resources;
+
+/**
+ * Custom ognl {@code ClassResolver} which behaves same like ognl's
+ * {@code DefaultClassResolver}. But uses the {@code Resources}
+ * utility class to find the target class instead of {@code Class#forName(String)}. 
+ * 
+ * @see https://github.com/mybatis/mybatis-3/issues/161
+ * 
+ * @author Daniel Guggi
+ * 
+ */
+public class OgnlClassResolver implements ClassResolver {
+
+  private Map<String, Class<?>> classes = new HashMap<String, Class<?>>(101);
+
+  @Override
+  public Class classForName(String className, Map context) throws ClassNotFoundException {
+    Class<?> result = null;
+    if ((result = classes.get(className)) == null) {
+      try {
+        result = Resources.classForName(className);
+      } catch (ClassNotFoundException e1) {
+        if (className.indexOf('.') == -1) {
+          result = Resources.classForName("java.lang." + className);
+          classes.put("java.lang." + className, result);
+        }
+      }
+      classes.put(className, result);
+    }
+    return result;
+  }
+
+}