You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/08/08 23:30:49 UTC
svn commit: r1155114 - in /cxf/branches/2.4.x-fixes: ./
tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java
Author: dkulp
Date: Mon Aug 8 21:30:49 2011
New Revision: 1155114
URL: http://svn.apache.org/viewvc?rev=1155114&view=rev
Log:
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.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.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.4.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java?rev=1155114&r1=1155113&r2=1155114&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java (original)
+++ cxf/branches/2.4.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java Mon Aug 8 21:30:49 2011
@@ -113,8 +113,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";
}