From commits-return-33158-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org Tue Jul 22 19:40:24 2014 Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E4FDF113D0 for ; Tue, 22 Jul 2014 19:40:23 +0000 (UTC) Received: (qmail 95324 invoked by uid 500); 22 Jul 2014 19:40:23 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 95263 invoked by uid 500); 22 Jul 2014 19:40:23 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 95254 invoked by uid 99); 22 Jul 2014 19:40:23 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Jul 2014 19:40:23 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 845B29AFEBE; Tue, 22 Jul 2014 19:40:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dkulp@apache.org To: commits@cxf.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer 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 +0000 (UTC) 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 Authored: Tue Jul 22 14:55:08 2014 -0400 Committer: Daniel Kulp 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