Repository: cxf Updated Branches: refs/heads/3.1.x-fixes e941dee73 -> 1960082af
[CXF-7081] Add support for xbean's asm6 shade Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c0ff6483 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c0ff6483 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c0ff6483 Branch: refs/heads/3.1.x-fixes Commit: c0ff648363f3282127b1d174f1d0a2a66b9d1e82 Parents: e941dee Author: Daniel Kulp <dk...@apache.org> Authored: Tue Mar 28 12:08:22 2017 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Wed Mar 29 08:35:29 2017 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/cxf/common/util/ASMHelper.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/c0ff6483/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 7e64216..95865eb 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 @@ -92,10 +92,11 @@ public class ASMHelper { private static synchronized Class<?> getASMClass() throws ClassNotFoundException { if (cwClass == null) { //try the "real" asm first, then the others - tryClass("org.objectweb.asm.ClassWriter"); - tryClass("org.apache.xbean.asm5.ClassWriter"); - tryClass("org.apache.xbean.asm4.ClassWriter"); - tryClass("org.apache.xbean.asm.ClassWriter"); + tryClass("org.objectweb.asm.ClassWriter"); + tryClass("org.apache.xbean.asm5.ClassWriter"); + tryClass("org.apache.xbean.asm6.ClassWriter"); + tryClass("org.apache.xbean.asm4.ClassWriter"); + tryClass("org.apache.xbean.asm.ClassWriter"); tryClass("org.springframework.asm.ClassWriter"); if (cwClass == null) { cwClass = getASMClassWriterClass();
