Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-9.4.x'

This commit is contained in:
Jan Bartel 2017-10-19 09:23:02 +11:00
parent 0a9104eea1 87067748d3
commit 606e74f3e2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ClassInheritanceHandler.java
View File

@ -48,16 +48,18 @@ public class ClassInheritanceHandler extends AbstractHandler
{ {
try try
{ {
//Don't scan Object
if ("java.lang.Object".equals(classInfo.getClassName()))
return;
for (int i=0; classInfo.getInterfaces() != null && i < classInfo.getInterfaces().length;i++) for (int i=0; classInfo.getInterfaces() != null && i < classInfo.getInterfaces().length;i++)
{ {
addToInheritanceMap(classInfo.getInterfaces()[i], classInfo.getClassName()); addToInheritanceMap(classInfo.getInterfaces()[i], classInfo.getClassName());
//_inheritanceMap.add (classInfo.getInterfaces()[i], classInfo.getClassName());
} }
//To save memory, we don't record classes that only extend Object, as that can be assumed //To save memory, we don't record classes that only extend Object, as that can be assumed
if (!"java.lang.Object".equals(classInfo.getSuperName())) if (!"java.lang.Object".equals(classInfo.getSuperName()))
{ {
addToInheritanceMap(classInfo.getSuperName(), classInfo.getClassName()); addToInheritanceMap(classInfo.getSuperName(), classInfo.getClassName());
//_inheritanceMap.add(classInfo.getSuperName(), classInfo.getClassName());
} }
} }
catch (Exception e) catch (Exception e)