Package: aspectj / 1.6.12+dfsg-3

use_system_asm.diff Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
Description: Use system ASM3 instead of AspectJ copy
Author: Damien Raude-Morvan <drazzib@debian.org>
Last-Updated: 2011-11-23
Forwarded: no
Index: b/org.aspectj/modules/weaver/src/org/aspectj/weaver/bcel/asm/AsmDetector.java
===================================================================
--- a/org.aspectj/modules/weaver/src/org/aspectj/weaver/bcel/asm/AsmDetector.java
+++ b/org.aspectj/modules/weaver/src/org/aspectj/weaver/bcel/asm/AsmDetector.java
@@ -24,8 +24,8 @@
 
 	static {
 		try {
-			Class<?> reader = Class.forName("aj.org.objectweb.asm.ClassReader");
-			Class<?> visitor = Class.forName("aj.org.objectweb.asm.ClassVisitor");
+			Class<?> reader = Class.forName("org.objectweb.asm.ClassReader");
+			Class<?> visitor = Class.forName("org.objectweb.asm.ClassVisitor");
 			Method m = reader.getMethod("accept", new Class[] { visitor, Integer.TYPE });
 			isAsmAround = m != null;
 		} catch (Exception e) {
Index: b/org.aspectj/modules/weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java
===================================================================
--- a/org.aspectj/modules/weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java
+++ b/org.aspectj/modules/weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java
@@ -15,8 +15,8 @@
 import org.aspectj.weaver.UnresolvedType;
 import org.aspectj.weaver.World;
 
-import aj.org.objectweb.asm.ClassReader;
-import aj.org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassWriter;
 
 /**
  * Uses asm to add the stack map attribute to methods in a class. The class is passed in as pure byte data and then a reader/writer