cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r542414 - /incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
Date Tue, 29 May 2007 05:19:13 GMT
Author: gawor
Date: Mon May 28 22:19:12 2007
New Revision: 542414

URL: http://svn.apache.org/viewvc?view=rev&rev=542414
Log:
generate proper default qname for parameters that contain webparam 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=542414&r1=542413&r2=542414
==============================================================================
--- 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:19:12 2007
@@ -192,29 +192,23 @@
         method = getDeclaredMethod(method);
         WebParam param = getWebParam(method, paramNumber);
         String tns = mi.getName().getNamespaceURI();
-        QName ret = null;
+        String local = null;
         if (param != null) {
-            /*if (param.targetNamespace().length() > 0) {
-                tns = param.targetNamespace();
-            }*/
-
-            String local = param.partName();
-            if (local.length() == 0) {
+            local = param.partName();
+            if (local == null || local.length() == 0) {
                 local = param.name();
             }
-            if (local.length() == 0) {
-                local = getDefaultLocalName(op, method, paramNumber, partIndex, prefix);
-            }
-            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, getDefaultLocalName(op, method, paramNumber, partIndex,
prefix));
+                local = getDefaultLocalName(op, method, paramNumber, partIndex, prefix);
             } else {
-                ret = new QName(tns, getOperationName(op.getInterface(),
-                                                      method).getLocalPart());
+                local = getOperationName(op.getInterface(), method).getLocalPart();
             }
         }
-        return ret;
+
+        return new QName(tns, local);
     }
     
     private int getPartIndex(Method method, int paraNumber, boolean isIn) {



Mime
View raw message