You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/11/19 00:22:39 UTC
svn commit: r1543230 - in
/cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/common:
jaxb/JAXBUtils.java util/ASMHelper.java
Author: dkulp
Date: Mon Nov 18 23:22:38 2013
New Revision: 1543230
URL: http://svn.apache.org/r1543230
Log:
Fix some test failures
Modified:
cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/common/util/ASMHelper.java
Modified: cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java?rev=1543230&r1=1543229&r2=1543230&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java (original)
+++ cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java Mon Nov 18 23:22:38 2013
@@ -1334,7 +1334,7 @@ public final class JAXBUtils {
mv.visitInsn(Opcodes.ARETURN);
mv.visitLabel(l2);
mv.visitLineNumber(43, l2);
- mv.visitFrame(Opcodes.F_APPEND, 1, new Object[] {"java/lang/String"}, 0, null);
+ //mv.visitFrame(Opcodes.F_APPEND, 1, new Object[] {"java/lang/String"}, 0, null);
mv.visitVarInsn(Opcodes.ALOAD, 2);
mv.visitInsn(Opcodes.ARETURN);
l4 = helper.createLabel();
Modified: cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/common/util/ASMHelper.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/common/util/ASMHelper.java?rev=1543230&r1=1543229&r2=1543230&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/common/util/ASMHelper.java (original)
+++ cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/common/util/ASMHelper.java Mon Nov 18 23:22:38 2013
@@ -414,6 +414,17 @@ public class ASMHelper {
}
}
+ public boolean is3x() {
+ try {
+ final Class<?> cls = ClassLoaderUtils.loadClass(cwClass.getPackage().getName() + ".MethodVisitor", cwClass);
+ final Method m = cls.getMethod("visitFrame", Integer.TYPE, String.class,
+ String.class, String.class);
+ return m != null;
+ } catch (Throwable t) {
+ return false;
+ }
+ }
+
public interface ClassWriter {
@WrapReturn(AnnotationVisitor.class)
AnnotationVisitor visitAnnotation(String cls, boolean t);