Moving recursive lookup for defineClass0 just in the native method itself; messing...

[jpf-core.git] / src / main / gov / nasa / jpf / vm / ClassLoaderInfo.java

diff --git a/src/main/gov/nasa/jpf/vm/ClassLoaderInfo.java b/src/main/gov/nasa/jpf/vm/ClassLoaderInfo.java
index 63c3c883b19a4a05d14bd53d41d715e1bb8c621f..b32858739172ee74fd52de1272650688e842d879 100644 (file)
--- a/src/main/gov/nasa/jpf/vm/ClassLoaderInfo.java
+++ b/src/main/gov/nasa/jpf/vm/ClassLoaderInfo.java
@@ -360,13 +360,7 @@ public class ClassLoaderInfo
           }
 
         } else { // no match found
-          // TODO: Fix for Groovy's model-checking
-          // TODO: May need to do a recursive lookup
-          if (parent != null) {
-            return parent.getResolvedClassInfo(typeName);
-          } else {
-            throw new ClassInfoException("class not found: " + typeName, this, "java.lang.ClassNotFoundException", typeName);
-          }
+          throw new ClassInfoException("class not found: " + typeName, this, "java.lang.ClassNotFoundException", typeName);
         }
       }
       
@@ -591,11 +585,6 @@ public class ClassLoaderInfo
           }          
         }
       }
-      // TODO: Fix for Groovy's model-checking
-      // TODO: May need to do a recursive lookup
-      if (parent != null) {
-        return parent.loadClass(typeName);
-      }
 
       // initiate the roundtrip & bail out
       pushloadClassFrame(typeName);