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 2007/08/01 19:04:51 UTC
svn commit: r561871 - in
/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators:
AntGenerator.java ClientGenerator.java ServerGenerator.java
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();
JavaInterface intf = interfaces.get(interfaceName);
+ if (intf == null) {
+ interfaceName = jp.getPortType();
+ intf = interfaces.get(interfaceName);
+ }
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";
Re: svn commit: r561871 - in
/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators:
AntGenerator.java ClientGenerator.java ServerGenerator.java
Posted by Glen Mazza <gl...@verizon.net>.
Oops! How could I have missed that?
Glen
Am Mittwoch, den 01.08.2007, 15:00 -0400 schrieb Daniel Kulp:
> Glen,
>
> On Wednesday 01 August 2007 13:44, Glen Mazza wrote:
> > > + 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.
>
> Line (C) results in a new value for interfaceName which results in a new
> value being used to lookup stuff from the interfaces Map. The map
> doesn't change, the lookup key does.
>
>
Re: svn commit: r561871 - in /incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators: AntGenerator.java ClientGenerator.java ServerGenerator.java
Posted by Daniel Kulp <dk...@apache.org>.
Glen,
On Wednesday 01 August 2007 13:44, Glen Mazza wrote:
> > + 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.
Line (C) results in a new value for interfaceName which results in a new
value being used to lookup stuff from the interfaces Map. The map
doesn't change, the lookup key does.
--
J. Daniel Kulp
Principal Engineer
IONA
P: 781-902-8727 C: 508-380-7194
daniel.kulp@iona.com
http://www.dankulp.com/blog
Re: svn commit: r561871 - in
/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators:
AntGenerator.java ClientGenerator.java ServerGenerator.java
Posted by Glen Mazza <gl...@verizon.net>.
Am Mittwoch, den 01.08.2007, 17:04 +0000 schrieb dkulp@apache.org:
> 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";
>
>