Merge pull request #10470 from douglasom/isDomainClassFix-3.1.x

Fixed non domain classes being identified as a domain class (base branch: 3.1.x).

Author: graemerocher

grails-core/src/main/groovy/org/grails/core/artefact/DomainClassArtefactHandler.java

@@ -37,7 +37,7 @@
 import java.lang.reflect.Modifier;
 import java.net.URL;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.TreeSet;
 
 /**
  * Evaluates the conventions that define a domain class in Grails.
@@ -115,7 +115,8 @@ public boolean isArtefactClass(Class clazz) {
         return isDomainClass(clazz);
     }
 
-    static final Map<Integer, Boolean> DOMAIN_CLASS_CHECK_CACHE = new ConcurrentHashMap<Integer, Boolean>();
+    static final TreeSet<String> DOMAIN_CLASS_CACHE = new TreeSet<String>();
+    static final TreeSet<String> NOT_DOMAIN_CLASS_CACHE = new TreeSet<String>();
 
     public static boolean isDomainClass(Class<?> clazz, boolean allowProxyClass) {
         boolean retval = isDomainClass(clazz);
@@ -128,17 +129,22 @@ public static boolean isDomainClass(Class<?> clazz, boolean allowProxyClass) {
     public static boolean isDomainClass(Class<?> clazz) {
         if (clazz == null) return false;
 
-        Integer cacheKey = System.identityHashCode(clazz);
+        String cacheKey = clazz.getName();
 
-        Boolean retval = DOMAIN_CLASS_CHECK_CACHE.get(cacheKey);
-        if (retval != null) {
-            return retval;
+        if (DOMAIN_CLASS_CACHE.contains(cacheKey)) {
+            return true;
+        } else if (NOT_DOMAIN_CLASS_CACHE.contains(cacheKey)) {
+            return false;
         }
 
-        retval = doIsDomainClassCheck(clazz);
-        
+        boolean retval = doIsDomainClassCheck(clazz);
+
         if (!developmentMode) {
-            DOMAIN_CLASS_CHECK_CACHE.put(cacheKey, retval);
+            if (retval) {
+                DOMAIN_CLASS_CACHE.add(cacheKey);
+            } else {
+                NOT_DOMAIN_CLASS_CACHE.add(cacheKey);
+            }
         }
         return retval;
     }