cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1487209 - in /cxf/branches/2.6.x-fixes: ./ api/src/main/java/org/apache/cxf/common/util/ASMHelper.java
Date Wed, 29 May 2013 02:20:10 GMT
Author: ffang
Date: Wed May 29 02:20:10 2013
New Revision: 1487209

URL: http://svn.apache.org/r1487209
Log:
Merged revisions 1487203 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

................
  r1487203 | ffang | 2013-05-29 10:08:29 +0800 (三, 29  5 2013) | 9 lines
  
  Merged revisions 1487196 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1487196 | ffang | 2013-05-29 10:00:59 +0800 (三, 29  5 2013) | 1 line
    
    [CXF-5040]support new asm4 shade of xbean
  ........
................

Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/common/util/ASMHelper.java

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/branches/2.7.x-fixes:r1487203
  Merged /cxf/trunk:r1487196

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/common/util/ASMHelper.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/common/util/ASMHelper.java?rev=1487209&r1=1487208&r2=1487209&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/common/util/ASMHelper.java (original)
+++ cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/common/util/ASMHelper.java Wed
May 29 02:20:10 2013
@@ -83,6 +83,7 @@ public class ASMHelper {
         if (cwClass == null) {
             //try the "real" asm first, then the others
             tryClass("org.objectweb.asm.ClassWriter"); 
+            tryClass("org.apache.xbean.asm4.ClassWriter"); 
             tryClass("org.apache.xbean.asm.ClassWriter"); 
             tryClass("org.springframework.asm.ClassWriter");
             if (cwClass == null) {



Mime
View raw message