Merge pull request #93 from harawata/class-in-default-package

DefaultClassResolver should resolve classes in the default package

src/main/java/ognl/DefaultClassResolver.java

@@ -42,7 +42,7 @@
  */
 public class DefaultClassResolver extends Object implements ClassResolver
 {
-    private final Map<String, Class> classes = new ConcurrentHashMap<>(101);
+    private final ConcurrentHashMap<String, Class> classes = new ConcurrentHashMap<>(101);
 
     public DefaultClassResolver()
     {
@@ -55,8 +55,22 @@ public Class classForName(String className, Map context) throws ClassNotFoundExc
         if (result != null) {
             return result;
         }
-        result = (className.indexOf('.') == -1) ? toClassForName("java.lang." + className) : toClassForName(className);
-        classes.put(className, result);
+        try {
+            result = toClassForName(className);
+        } catch (ClassNotFoundException e) {
+            if (className.indexOf('.') > -1) {
+                throw e;
+            }
+            // The class was not in the default package.
+            // Try prepending 'java.lang.'.
+            try {
+                result = toClassForName("java.lang." + className);
+            } catch (ClassNotFoundException e2) {
+                // Report the specified class name as-is.
+                throw e;
+            }
+        }
+        classes.putIfAbsent(className, result);
         return result;
     }
 

src/test/java/ClassInDefaultPackage.java

@@ -0,0 +1,4 @@
+
+class ClassInDefaultPackage {
+    public static final int CONST = 99;
+}

src/test/java/ognl/DefaultClassResolverTest.java

@@ -0,0 +1,41 @@
+package ognl;
+
+import junit.framework.TestCase;
+
+public class DefaultClassResolverTest extends TestCase {
+
+    public void testClassInDefaultPackageResolution() throws Exception {
+        DefaultClassResolver resolver = new DefaultClassResolver();
+        OgnlContext context = (OgnlContext) Ognl.createDefaultContext(null,
+                new DefaultMemberAccess(false));
+        assertNotNull(resolver.classForName("ClassInDefaultPackage", context));
+    }
+
+    public void testEnsureClassNotFoundException() throws Exception {
+        DefaultClassResolver resolver = new DefaultClassResolver();
+        OgnlContext context = (OgnlContext) Ognl.createDefaultContext(null,
+                new DefaultMemberAccess(false));
+        try {
+            resolver.classForName("no.such.Class", context);
+            fail("Expected ClassNotFoundException as the specified class does not exist.");
+        } catch (Exception e) {
+            assertEquals(ClassNotFoundException.class, e.getClass());
+            assertEquals("no.such.Class", e.getMessage());
+        }
+    }
+
+    public void testEnsureClassNotFoundExceptionReportsSpecifiedName()
+            throws Exception {
+        DefaultClassResolver resolver = new DefaultClassResolver();
+        OgnlContext context = (OgnlContext) Ognl.createDefaultContext(null,
+                new DefaultMemberAccess(false));
+        try {
+            resolver.classForName("BogusClass", context);
+            fail("Expected ClassNotFoundException as the specified class does not exist.");
+        } catch (Exception e) {
+            assertEquals(ClassNotFoundException.class, e.getClass());
+            assertEquals("BogusClass", e.getMessage());
+        }
+    }
+
+}