From 264aa61a2bbe6b4a470814218d894cf0c2cebc25 Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@webtide.com>
Date: Thu, 19 Oct 2017 09:19:06 +1100
Subject: [PATCH] Issue #1892

---
 .../eclipse/jetty/annotations/ClassInheritanceHandler.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ClassInheritanceHandler.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ClassInheritanceHandler.java
index d0d0c15d341..90f6806a86a 100644
--- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ClassInheritanceHandler.java
+++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ClassInheritanceHandler.java
@@ -48,16 +48,18 @@ public class ClassInheritanceHandler extends AbstractHandler
     {
         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++)
             {
                 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
             if (!"java.lang.Object".equals(classInfo.getSuperName()))
             {
                 addToInheritanceMap(classInfo.getSuperName(), classInfo.getClassName());
-                //_inheritanceMap.add(classInfo.getSuperName(), classInfo.getClassName());
             }
         }
         catch (Exception e)