Am Mittwoch, den 01.08.2007, 17:04 +0000 schrieb [EMAIL PROTECTED]: > Author: dkulp > Date: Wed Aug 1 10:04:44 2007 > New Revision: 561871 > > URL: http://svn.apache.org/viewvc?view=rev&rev=561871 > Log: > Fix some NPE's in the generators > > Modified: > > incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/AntGenerator.java > > incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ClientGenerator.java > > incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java > > Modified: > incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/AntGenerator.java > URL: > http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/AntGenerator.java?view=diff&rev=561871&r1=561870&r2=561871 > ============================================================================== > --- > incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/AntGenerator.java > (original) > +++ > incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/AntGenerator.java > Wed Aug 1 10:04:44 2007 > @@ -80,8 +80,12 @@ > Iterator i = js.getPorts().iterator(); > while (i.hasNext()) { > JavaPort jp = (JavaPort)i.next(); > - String interfaceName = jp.getPortType(); > + String interfaceName = jp.getInterfaceClass(); > (A) JavaInterface intf = interfaces.get(interfaceName); > (B)+ if (intf == null) { > (C)+ interfaceName = jp.getPortType(); > (D)+ intf = interfaces.get(interfaceName); > (E)+ }
There may be a bug here (and in the two cases below). Namely, I can't see the reason for statement (D) above. If (A) results in intf being set to NULL, lines (B) - (E) will be activated. But how can statement (D) set intf to anything but null again--statement (C) has no side effect in adding interface names to the interfaces object. Regards, Glen > > String clientClassName = intf.getPackageName() + "." + > interfaceName + "_" > + > NameUtil.mangleNameToClassName(jp.getPortName()) + "_Client"; > > Modified: > incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ClientGenerator.java > URL: > http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ClientGenerator.java?view=diff&rev=561871&r1=561870&r2=561871 > ============================================================================== > --- > incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ClientGenerator.java > (original) > +++ > incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ClientGenerator.java > Wed Aug 1 10:04:44 2007 > @@ -80,8 +80,12 @@ > Iterator i = js.getPorts().iterator(); > while (i.hasNext()) { > JavaPort jp = (JavaPort)i.next(); > - String interfaceName = jp.getPortType(); > + String interfaceName = jp.getInterfaceClass(); > JavaInterface intf = interfaces.get(interfaceName); > + if (intf == null) { > + interfaceName = jp.getPortType(); > + intf = interfaces.get(interfaceName); > + } > > String clientClassName = interfaceName + "_" > + > NameUtil.mangleNameToClassName(jp.getPortName()) + "_Client"; > > Modified: > incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java > URL: > http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java?view=diff&rev=561871&r1=561870&r2=561871 > ============================================================================== > --- > incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java > (original) > +++ > incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java > Wed Aug 1 10:04:44 2007 > @@ -81,8 +81,12 @@ > Iterator i = js.getPorts().iterator(); > while (i.hasNext()) { > JavaPort jp = (JavaPort)i.next(); > - String interfaceName = jp.getPortType(); > + String interfaceName = jp.getInterfaceClass(); > JavaInterface intf = interfaces.get(interfaceName); > + if (intf == null) { > + interfaceName = jp.getPortType(); > + intf = interfaces.get(interfaceName); > + } > address = StringUtils.isEmpty(jp.getBindingAdress()) ? > address : jp.getBindingAdress(); > String serverClassName = interfaceName + "_" > + > NameUtil.mangleNameToClassName(jp.getPortName()) + "_Server"; > >
