cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1155115 - in /cxf/branches/2.3.x-fixes: ./ tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java
Date Mon, 08 Aug 2011 21:32:36 GMT
Author: dkulp
Date: Mon Aug  8 21:32:35 2011
New Revision: 1155115

URL: http://svn.apache.org/viewvc?rev=1155115&view=rev
Log:
Merged revisions 1155114 via svnmerge from 
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes

................
  r1155114 | dkulp | 2011-08-08 17:30:49 -0400 (Mon, 08 Aug 2011) | 10 lines
  
  Merged revisions 1155112 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1155112 | dkulp | 2011-08-08 17:28:57 -0400 (Mon, 08 Aug 2011) | 2 lines
    
    [CXF-3625] Fix issue with a generated "Exception" type could cause
    uncompilable code.
  ........
................

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java

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

Modified: cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java?rev=1155115&r1=1155114&r2=1155115&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java
(original)
+++ cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java
Mon Aug  8 21:32:35 2011
@@ -95,8 +95,12 @@ public class FaultGenerator extends Abst
                     }
                     setAttributes("paraName", ProcessorUtil.mangleNameToVariableName(jf.getName()));
                 }
-                
-                
+                ClassCollector collector = penv.get(ClassCollector.class);
+                for (String pkg : collector.getTypesPackages()) {
+                    if (collector.containTypesClass(pkg, "Exception")) {
+                        exceptionSuperclass = "java.lang.Exception";
+                    }
+                }
                 if (expClz.getName().equals(exceptionSuperclass)) {
                     exceptionSuperclass = "java.lang.Exception";
                 }



Mime
View raw message