Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes 7b42f0cea -> d2ab3e96b
[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/2f20ec5c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2f20ec5c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2f20ec5c
Branch: refs/heads/2.7.x-fixes
Commit: 2f20ec5c0b8c541dddd7a6888bfa2b014b314416
Parents: 7b42f0c
Author: Daniel Kulp <dkulp@apache.org>
Authored: Tue Jul 22 14:55:08 2014 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Wed Jul 23 16:24:07 2014 -0400
----------------------------------------------------------------------
api/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/2f20ec5c/api/src/main/java/org/apache/cxf/common/util/ASMHelper.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/cxf/common/util/ASMHelper.java b/api/src/main/java/org/apache/cxf/common/util/ASMHelper.java
index f36db0d..b183968 100644
--- a/api/src/main/java/org/apache/cxf/common/util/ASMHelper.java
+++ b/api/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
|