Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2014-04-28 09:36:03 -0400
committerJan Bartel2014-04-28 09:36:36 -0400
commit609945fe7c6f0f5a48a77b3c77e31201d439fd37 (patch)
tree632129310226b0c0779d45a66d5dfba9afe01266 /jetty-osgi/jetty-osgi-boot/src
parent00d61ce1339f71d0efee44bcd5bd20ba1ec62393 (diff)
downloadorg.eclipse.jetty.project-609945fe7c6f0f5a48a77b3c77e31201d439fd37.tar.gz
org.eclipse.jetty.project-609945fe7c6f0f5a48a77b3c77e31201d439fd37.tar.xz
org.eclipse.jetty.project-609945fe7c6f0f5a48a77b3c77e31201d439fd37.zip
433656 Change to Opcode.ASM5 breaks jetty-osgi
Diffstat (limited to 'jetty-osgi/jetty-osgi-boot/src')
-rw-r--r--jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationParser.java9
1 files changed, 9 insertions, 0 deletions
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 b1ccba263a..8887036f59 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
@@ -35,6 +35,7 @@ import org.eclipse.jetty.annotations.ClassNameResolver;
import org.eclipse.jetty.osgi.boot.utils.BundleFileLocatorHelper;
import org.eclipse.jetty.util.ConcurrentHashSet;
import org.eclipse.jetty.util.resource.Resource;
+import org.objectweb.asm.Opcodes;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
@@ -50,6 +51,14 @@ public class AnnotationParser extends org.eclipse.jetty.annotations.AnnotationPa
private ConcurrentHashMap<Resource, Bundle> _resourceToBundle = new ConcurrentHashMap<Resource, Bundle>();
private ConcurrentHashMap<Bundle,URI> _bundleToUri = new ConcurrentHashMap<Bundle, URI>();
+ static
+ {
+ //As of jetty 9.2.0, the impl of asm visitor classes is compatible with both asm4 and asm5.
+ //We need to use asm4 with osgi, because we need to use aries spifly to support annotations,
+ //and currently this only supports asm4. Therefore, we set the asm api version to be 4 for osgi.
+ ASM_OPCODE_VERSION = Opcodes.ASM4;
+ }
+
/**
* Keep track of a jetty URI Resource and its associated OSGi bundle.
* @param uri

Back to the top