+2012-12-17 Andrew Haley <aph@redhat.com>
+
+ * tools/gnu/classpath/tools/javah/Main.java (parseClasses): Don't
+ scan inner classes if our item is a file.
+
2012-09-14 David Edelsohn <dje.gcc@gmail.com>
* configure: Regenerated.
results.put(filename, klass);
parsed.add(item.toString());
- // Check to see if there are inner classes to also parse
- Iterator<?> innerClasses = klass.innerClasses.iterator();
- HashSet<Object> innerNames = new HashSet<Object>();
- while (innerClasses.hasNext())
+ if (! (item instanceof File))
{
- String innerName = ((InnerClassNode) innerClasses.next()).name;
- if (!parsed.contains(innerName))
- innerNames.add(innerName);
+ // Check to see if there are inner classes to also parse
+ Iterator<?> innerClasses = klass.innerClasses.iterator();
+ HashSet<Object> innerNames = new HashSet<Object>();
+ while (innerClasses.hasNext())
+ {
+ String innerName = ((InnerClassNode) innerClasses.next()).name;
+ if (!parsed.contains(innerName))
+ innerNames.add(innerName);
+ }
+ results.putAll(parseClasses(innerNames.iterator()));
}
- results.putAll(parseClasses(innerNames.iterator()));
}
return results;
}