cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject git commit: [CXF-5895] Fix issues with shaded ASM versions.... Patch from Romain Manni-Bucau applied
Date Tue, 22 Jul 2014 19:40:23 GMT
Repository: cxf
Updated Branches:
  refs/heads/master a46e5d411 -> a8c97f852


[CXF-5895] Fix issues with shaded ASM versions....
Patch from Romain Manni-Bucau applied


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a8c97f85
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a8c97f85
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a8c97f85

Branch: refs/heads/master
Commit: a8c97f85247c343171c03af8878e08c761252e0b
Parents: a46e5d4
Author: Daniel Kulp <dkulp@apache.org>
Authored: Tue Jul 22 14:55:08 2014 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Tue Jul 22 14:55:38 2014 -0400

----------------------------------------------------------------------
 core/src/main/java/org/apache/cxf/common/util/ASMHelper.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/a8c97f85/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 f36db0d..b183968 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
@@ -74,8 +74,8 @@ public class ASMHelper {
                 
                 //old versions don't have this, but we need it
                 Class<?> cls = ClassLoaderUtils.loadClass(c2.getPackage().getName()
+ ".MethodVisitor", c2);
-                cls.getMethod("visitFrame", Integer.TYPE, String.class,
-                              String.class, String.class);
+                cls.getMethod("visitFrame", Integer.TYPE, Integer.TYPE,
+                              Object[].class,  Integer.TYPE, Object[].class);
                 cwClass = c2;
             } catch (Throwable t) {
                 //ignore


Mime
View raw message