You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by rm...@apache.org on 2014/03/19 07:44:49 UTC
svn commit: r1579149 - in /incubator/sirona/trunk/agent/javaagent: pom.xml
src/main/java/org/apache/sirona/javaagent/SironaClassVisitor.java
Author: rmannibucau
Date: Wed Mar 19 06:44:49 2014
New Revision: 1579149
URL: http://svn.apache.org/r1579149
Log:
SIRONA-32 asm 5
Modified:
incubator/sirona/trunk/agent/javaagent/pom.xml
incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/SironaClassVisitor.java
Modified: incubator/sirona/trunk/agent/javaagent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/pom.xml?rev=1579149&r1=1579148&r2=1579149&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/pom.xml (original)
+++ incubator/sirona/trunk/agent/javaagent/pom.xml Wed Mar 19 06:44:49 2014
@@ -30,7 +30,7 @@
<properties>
<test.debug.remote>false</test.debug.remote>
<sirona.agent.debug>false</sirona.agent.debug>
- <asm.version>4.2</asm.version>
+ <asm.version>5.0</asm.version>
<agent.class>org.apache.sirona.javaagent.SironaAgent</agent.class>
</properties>
Modified: incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/SironaClassVisitor.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/SironaClassVisitor.java?rev=1579149&r1=1579148&r2=1579149&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/SironaClassVisitor.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/main/java/org/apache/sirona/javaagent/SironaClassVisitor.java Wed Mar 19 06:44:49 2014
@@ -52,7 +52,7 @@ public class SironaClassVisitor extends
private Type classType;
public SironaClassVisitor(final ClassWriter writer, final String javaName, final Map<String, String> keys) {
- super(ASM4, new SironaStaticInitMerger(writer, keys));
+ super(ASM5, new SironaStaticInitMerger(writer, keys));
this.javaName = javaName;
}
@@ -137,7 +137,7 @@ public class SironaClassVisitor extends
private final Method method;
public ProxyMethodsVisitor(final MethodVisitor methodVisitor, final int access, final Method method, final Type clazz) {
- super(ASM4, methodVisitor, access, method.getName(), method.getDescriptor());
+ super(ASM5, methodVisitor, access, method.getName(), method.getDescriptor());
this.clazz = clazz;
this.method = method;
this.isStatic = Modifier.isStatic(access);
@@ -248,7 +248,7 @@ public class SironaClassVisitor extends
private final Collection<Runnable> rewriteTasks = new LinkedList<Runnable>();
public MoveAnnotationOnProxy(final ProxyMethodsVisitor decorator, final MethodVisitor methodVisitor) {
- super(ASM4);
+ super(ASM5);
this.decorator = decorator;
this.delegate = methodVisitor;
}
@@ -330,6 +330,11 @@ public class SironaClassVisitor extends
}
@Override
+ public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf) {
+ delegate.visitMethodInsn(opcode, owner, name, desc, itf);
+ }
+
+ @Override
public void visitMethodInsn(int opcode, String owner, String name, String desc) {
delegate.visitMethodInsn(opcode, owner, name, desc);
}
@@ -412,7 +417,7 @@ public class SironaClassVisitor extends
private AnnotationVisitor delegate;
public AnnotationRewriter(final Collection<Runnable> tasks) {
- super(ASM4);
+ super(ASM5);
this.runnables = tasks;
}
@@ -536,7 +541,7 @@ public class SironaClassVisitor extends
if (STATIC_INIT.equals(name)) {
final String n = STATIC_CLINT_MERGE_PREFIX + counter++;
final MethodVisitor mv = cv.visitMethod(ACC_PRIVATE + ACC_STATIC, n, desc, signature, exceptions);
- clinit.visitMethodInsn(INVOKESTATIC, this.name, n, desc);
+ clinit.visitMethodInsn(INVOKESTATIC, this.name, n, desc, false);
return mv;
}
return cv.visitMethod(access, name, desc, signature, exceptions);