DynamicJava: Fixed handling of LinkageErrors when classes are loaded by TopLevelContext

dlsmith · dlsmith · commit 5293cb4cfbc2 · 2007-12-17T21:15:49.000Z
git-svn-id: file:///tmp/test-svn/trunk@4284 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/TopLevelContext.java b/dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/TopLevelContext.java
@@ -158,16 +158,20 @@ public DJClass getTopLevelClass(String name, TypeSystem ts) throws AmbiguousName
     if (TextUtil.contains(name, '.')) {
       try { return SymbolUtil.wrapClass(_loader.loadClass(name)); }
       catch (ClassNotFoundException e) { return null; }
+      catch (LinkageError e) { return null; }
     }
     else {
       DJClass result = _importedTopLevelClasses.get(name);
       if (result == null) {
         try { result = SymbolUtil.wrapClass(_loader.loadClass(makeClassName(name))); }
-        catch (ClassNotFoundException e) {
+        catch (ClassNotFoundException e) { /* ignore -- class is not in the imported/default package */ }
+        catch (LinkageError e) { /* ignore -- class is not in the imported/default package */ }
+        if (result == null) {
           LinkedList<Class<?>> onDemandMatches = new LinkedList<Class<?>>();
           for (String p : _onDemandPackages) {
             try { onDemandMatches.add(_loader.loadClass(p + "." + name)); }
             catch (ClassNotFoundException e2) { /* ignore -- class is not in this package */ }
+            catch (LinkageError e) { /* ignore -- class is not in this package */ }
           }
           if (onDemandMatches.size() > 1) { throw new AmbiguousNameException(); }
           else if (onDemandMatches.size() == 1) { result = SymbolUtil.wrapClass(onDemandMatches.getFirst()); }
