From d4c035a06f114d68d3be3dded37c4b41a507f375 Mon Sep 17 00:00:00 2001
From: Jan Bartel
Date: Thu, 19 Sep 2013 15:42:42 +1000
Subject: 417561 Refactor annotation related code to remove some deadwood

---
 .../jetty/osgi/annotations/AnnotationConfiguration.java        | 10 ----------
 .../org/eclipse/jetty/osgi/annotations/AnnotationParser.java   |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

(limited to 'jetty-osgi/jetty-osgi-boot/src')

diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationConfiguration.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationConfiguration.java
index 4b15ae5b9d..e5d2d2cf13 100644
--- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationConfiguration.java
+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationConfiguration.java
@@ -152,16 +152,6 @@ public class AnnotationConfiguration extends org.eclipse.jetty.annotations.Annot
         Resource bundleRes = parser.getResource(bundle);
         
         parser.clearHandlers();
-        for (AbstractDiscoverableAnnotationHandler h:_discoverableAnnotationHandlers)
-        {
-            if (h instanceof AbstractDiscoverableAnnotationHandler)
-            {
-                if (webbundle == bundle)                    
-                ((AbstractDiscoverableAnnotationHandler)h).setResource(null); 
-                else
-                    ((AbstractDiscoverableAnnotationHandler)h).setResource(bundleRes);  
-            }
-        }
         parser.registerHandlers(_discoverableAnnotationHandlers);
         parser.registerHandler(_classInheritanceHandler);
         parser.registerHandlers(_containerInitializerAnnotationHandlers);
diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationParser.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationParser.java
index 096cb8a821..c2c14e3ed7 100644
--- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationParser.java
+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationParser.java
@@ -190,7 +190,7 @@ public class AnnotationParser extends org.eclipse.jetty.annotations.AnnotationPa
             //transform into a classname to pass to the resolver
             String shortName =  name.replace('/', '.').substring(0,name.length()-6);
             if ((resolver == null)|| (!resolver.isExcluded(shortName) && (!isParsed(shortName) || resolver.shouldOverride(shortName))))
-                scanClass(classUrl.openStream());
+                scanClass(getResource(bundle), classUrl.openStream());
         }
     }
     
-- 
cgit v1.2.3