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 93A7310D22 for ; Mon, 30 Sep 2013 17:45:16 +0000 (UTC) Received: (qmail 1202 invoked by uid 500); 30 Sep 2013 17:45:07 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 1011 invoked by uid 500); 30 Sep 2013 17:45:00 -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 897 invoked by uid 99); 30 Sep 2013 17:44:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Sep 2013 17:44:57 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Sep 2013 17:44:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 655A423889D5; Mon, 30 Sep 2013 17:44:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1527682 - /cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/common/util/ASMHelper.java Date: Mon, 30 Sep 2013 17:44:14 -0000 To: commits@cxf.apache.org From: ay@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130930174414.655A423889D5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ay Date: Mon Sep 30 17:44:14 2013 New Revision: 1527682 URL: http://svn.apache.org/r1527682 Log: integrate rev 1490642 to cxf-2.7.x Modified: 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/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=1527682&r1=1527681&r2=1527682&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 Sep 30 17:44:14 2013 @@ -105,17 +105,25 @@ public class ASMHelper { public static int CHECKCAST = 0; public static int INVOKEINTERFACE = 0; public static int GETFIELD = 0; + public static int GETSTATIC = 0; public static int ASTORE = 0; public static int PUTFIELD = 0; + public static int PUTSTATIC = 0; public static int RETURN = 0; + public static int F_APPEND = 0; + public static int F_SAME = 0; + public static int F_SAME1 = 0; public static int INVOKESPECIAL = 0; public static int ACC_PUBLIC = 0; public static int ACC_FINAL = 0; public static int ACC_SUPER = 0; public static int ACC_PRIVATE = 0; + public static int ACC_STATIC = 0; public static int V1_5 = 0; + public static int V1_6 = 0; public static int ACC_ABSTRACT = 0; public static int ACC_INTERFACE = 0; + public static int ACC_SYNTHETIC = 0; public static int ILOAD = 0; public static int IRETURN = 0; public static int NEW = 0; @@ -168,7 +176,7 @@ public class ASMHelper { return buf.toString(); } - protected static String periodToSlashes(String s) { + public static String periodToSlashes(String s) { char ch[] = s.toCharArray(); for (int x = 0; x < ch.length; x++) { if (ch[x] == '.') { @@ -448,6 +456,10 @@ public class ASMHelper { void visitFieldInsn(int getfield, String periodToSlashes, String string, String string2); void visitJumpInsn(int ifnonnull, @UnwrapParam(typeMethodName = "realType") Label nonNullLabel); + void visitFrame(int type, int nLocal, Object[] local, int nStack, Object[] stack); + + @WrapReturn(AnnotationVisitor.class) + AnnotationVisitor visitAnnotation(String cls, boolean b); } public interface AnnotationVisitor { void visit(String arg0, @UnwrapParam(typeMethodName = "realType") ASMType arg1);