Author: dkulp
Date: Wed Dec 10 08:52:53 2008
New Revision: 725335

URL: http://svn.apache.org/viewvc?rev=725335&view=rev
Log:
Fix regression from 2.1.3 where stack traces are generated and things don't 
deploy if asm isn't there.

Modified:
    
cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ASMHelper.java
    
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java

Modified: 
cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ASMHelper.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ASMHelper.java?rev=725335&r1=725334&r2=725335&view=diff
==============================================================================
--- 
cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ASMHelper.java 
(original)
+++ 
cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ASMHelper.java 
Wed Dec 10 08:52:53 2008
@@ -126,7 +126,7 @@
             try {
                 cls = ClassWriter.class;
             } catch (NoClassDefFoundError error) {
-                return null;
+                throw new RuntimeException("No ASM ClassWriterFound", error);
             }
             try {
                 // ASM 1.5.x/2.x

Modified: 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java?rev=725335&r1=725334&r2=725335&view=diff
==============================================================================
--- 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java
 (original)
+++ 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java
 Wed Dec 10 08:52:53 2008
@@ -111,7 +111,9 @@
 
     public Set<Class<?>> generate() {
         try {
-            createClassWriter();
+            if (createClassWriter() == null) {
+                throw new ClassNotFoundException();
+            }
         } catch (Throwable t) {
             for (OperationInfo opInfo : interfaceInfo.getOperations()) {
                 if (opInfo.isUnwrappedCapable()


Reply via email to