Repository: cxf Updated Branches: refs/heads/master 23849faa6 -> e6fc7e502
Update ASM version Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e6fc7e50 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e6fc7e50 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e6fc7e50 Branch: refs/heads/master Commit: e6fc7e50266d45c8b5afb002abdc44b69585cc69 Parents: 23849fa Author: Daniel Kulp <dk...@apache.org> Authored: Fri Mar 6 16:11:22 2015 -0500 Committer: Daniel Kulp <dk...@apache.org> Committed: Fri Mar 6 16:11:22 2015 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/cxf/common/util/ASMHelper.java | 1 + parent/pom.xml | 8 +++----- .../apache/cxf/binding/corba/utils/CorbaAnyHelper.java | 12 ++++++------ 3 files changed, 10 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/e6fc7e50/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java b/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java index bf1d692..bf37622 100644 --- a/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java +++ b/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java @@ -131,6 +131,7 @@ public class ASMHelper { public static int ACC_STATIC = 0; public static int V1_5 = 0; public static int V1_6 = 0; + public static int V1_7 = 0; public static int ACC_ABSTRACT = 0; public static int ACC_INTERFACE = 0; public static int ACC_SYNTHETIC = 0; http://git-wip-us.apache.org/repos/asf/cxf/blob/e6fc7e50/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index d5d3bd3..23e4117 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -43,12 +43,10 @@ <cxf.codegen.jvmArgs /> <cxf.eclipse.outputDirectory>${basedir}/target/classes</cxf.eclipse.outputDirectory> <!-- stuff related to ASM --> - <!-- use asm 3.x for now to avoid breaking 3rd party components --> - <cxf.asm.groupId>asm</cxf.asm.groupId> + <cxf.asm.groupId>org.ow2.asm</cxf.asm.groupId> <cxf.asm.artifactId>asm</cxf.asm.artifactId> - <cxf.asm.version>3.3.1</cxf.asm.version> - <cxf.asm.bundle.version>3.3.1_1</cxf.asm.bundle.version> - <cxf.osgi.asm.version>[2.0,6)</cxf.osgi.asm.version> + <cxf.asm.version>5.0.3</cxf.asm.version> + <cxf.osgi.asm.version>[3.0,6)</cxf.osgi.asm.version> <!-- OSGi related properties --> <cxf.fragment.host /> <cxf.bundle.activator /> http://git-wip-us.apache.org/repos/asf/cxf/blob/e6fc7e50/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaAnyHelper.java ---------------------------------------------------------------------- diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaAnyHelper.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaAnyHelper.java index ce5ef82..f912f9a 100644 --- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaAnyHelper.java +++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaAnyHelper.java @@ -57,7 +57,6 @@ public final class CorbaAnyHelper { if ("com.sun.corba.se.impl.corba.AnyImpl".equals(value.getClass().getName())) { value = createFixedAny(orb, value); } - return value; } @@ -290,7 +289,7 @@ public final class CorbaAnyHelper { ClassWriter cw = helper.createClassWriter(); FieldVisitor fv; - cw.visit(Opcodes.V1_5, Opcodes.ACC_PUBLIC + Opcodes.ACC_SUPER, + cw.visit(Opcodes.V1_6, Opcodes.ACC_PUBLIC + Opcodes.ACC_SUPER, "org/apache/cxf/binding/corba/utils/FixedAnyImpl", null, "com/sun/corba/se/impl/corba/AnyImpl", null); @@ -301,8 +300,8 @@ public final class CorbaAnyHelper { addFixedAnyConstructor(helper, cw); addInsertOverride(helper, cw); addExtractOverride(helper, cw); - addReadOverride(helper, cw); addWriteOverride(helper, cw); + addReadOverride(helper, cw); cw.visitEnd(); @@ -337,7 +336,7 @@ public final class CorbaAnyHelper { "obj", "Lorg/omg/CORBA/portable/Streamable;"); mv.visitVarInsn(Opcodes.ALOAD, 1); mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "org/omg/CORBA/portable/Streamable", - "_read", "(Lorg/omg/CORBA/portable/InputStream;)V", false); + "_read", "(Lorg/omg/CORBA/portable/InputStream;)V", true); Label l3 = helper.createLabel(); mv.visitJumpInsn(Opcodes.GOTO, l3); mv.visitLabel(l1); @@ -379,10 +378,11 @@ public final class CorbaAnyHelper { mv.visitVarInsn(Opcodes.ALOAD, 0); mv.visitFieldInsn(Opcodes.GETFIELD, "org/apache/cxf/binding/corba/utils/FixedAnyImpl", "obj", "Lorg/omg/CORBA/portable/Streamable;"); + + Label l3 = helper.createLabel(); mv.visitVarInsn(Opcodes.ALOAD, 1); mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "org/omg/CORBA/portable/Streamable", - "_write", "(Lorg/omg/CORBA/portable/OutputStream;)V", false); - Label l3 = helper.createLabel(); + "_write", "(Lorg/omg/CORBA/portable/OutputStream;)V", true); mv.visitJumpInsn(Opcodes.GOTO, l3); mv.visitLabel(l1); mv.visitLineNumber(64, l1);