svn commit: r542417 - /incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java

[gawor]

Author: gawor
Date: Mon May 28 22:48:23 2007
New Revision: 542417

URL: http://svn.apache.org/viewvc?view=rev&rev=542417
Log:
generate proper default qname for output parameters that contain webResult 
annotation but have no annotation attribute set

Modified:
    
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java

Modified: 
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java?view=diff&rev=542417&r1=542416&r2=542417
==============================================================================
--- 
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
 (original)
+++ 
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
 Mon May 28 22:48:23 2007
@@ -353,29 +353,23 @@
         } else {
             WebResult webResult = getWebResult(method);
             String tns = op.getOutput().getName().getNamespaceURI();
-            
-            QName ret;
+            String local = null;
             if (webResult != null) {
-                String local = webResult.partName();
-//                if (webResult.targetNamespace().length() > 0) {
-//                    tns = webResult.targetNamespace();
-//                }
-                if (local.length() == 0) {
+                local = webResult.partName();
+                if (local == null || local.length() == 0) {
                     local = webResult.name();
                 }
-                if (local.length() == 0) {
-                    local = getDefaultLocalName(op, method, paramNumber, 
op.getOutput().size(), "return");
-                }
-                ret = new QName(tns, local);
-            } else {
+            }
+
+            if (local == null || local.length() == 0) {
                 if (Boolean.TRUE.equals(isRPC(method)) || 
!Boolean.FALSE.equals(isWrapped(method))) {
-                    ret = new QName(tns, "return");
+                    local = "return";
                 } else {
-                    ret = new QName(tns, getOperationName(op.getInterface(),
-                                                          
method).getLocalPart() + "Response");
+                    local = getOperationName(op.getInterface(), 
method).getLocalPart() + "Response";
                 }
             }
-            return ret;
+
+            return new QName(tns, local);
         }        
     }