diff options
| author | Jan Bartel | 2013-09-19 05:42:42 +0000 |
|---|---|---|
| committer | Jan Bartel | 2013-09-19 05:43:38 +0000 |
| commit | d4c035a06f114d68d3be3dded37c4b41a507f375 (patch) | |
| tree | 7b65062cb2bb9d97333d20863a9826d131a254d3 /jetty-osgi | |
| parent | aa5705fd788dc207fcaba4c312a44542fbe25a8d (diff) | |
| download | org.eclipse.jetty.project-d4c035a06f114d68d3be3dded37c4b41a507f375.tar.gz org.eclipse.jetty.project-d4c035a06f114d68d3be3dded37c4b41a507f375.tar.xz org.eclipse.jetty.project-d4c035a06f114d68d3be3dded37c4b41a507f375.zip | |
417561 Refactor annotation related code to remove some deadwood
Diffstat (limited to 'jetty-osgi')
2 files changed, 1 insertions, 11 deletions
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()); } } |