geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r1087197 - /geronimo/bundles/trunk/axis2/src/main/java/org/apache/axis2/jaxws/runtime/description/marshal/impl/ArtifactProcessor.java
Date Thu, 31 Mar 2011 06:14:15 GMT
Author: xuhaihong
Date: Thu Mar 31 06:14:15 2011
New Revision: 1087197

URL: http://svn.apache.org/viewvc?rev=1087197&view=rev
Log:
Try the new change for Axis2 4992

Modified:
    geronimo/bundles/trunk/axis2/src/main/java/org/apache/axis2/jaxws/runtime/description/marshal/impl/ArtifactProcessor.java

Modified: geronimo/bundles/trunk/axis2/src/main/java/org/apache/axis2/jaxws/runtime/description/marshal/impl/ArtifactProcessor.java
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/axis2/src/main/java/org/apache/axis2/jaxws/runtime/description/marshal/impl/ArtifactProcessor.java?rev=1087197&r1=1087196&r2=1087197&view=diff
==============================================================================
--- geronimo/bundles/trunk/axis2/src/main/java/org/apache/axis2/jaxws/runtime/description/marshal/impl/ArtifactProcessor.java
(original)
+++ geronimo/bundles/trunk/axis2/src/main/java/org/apache/axis2/jaxws/runtime/description/marshal/impl/ArtifactProcessor.java
Thu Mar 31 06:14:15 2011
@@ -116,7 +116,7 @@ class ArtifactProcessor {
                     String foundRequestWrapperName = getWrapperClass("@RequestWrapper",
                         requestWrapperName, 
                         packageName, 
-                        javaMethodToClassName(methodName) + "Request",
+                        javaMethodToClassName(methodName),
                         ed.getAxisService().getClassLoader(),
                         serviceDesc);
 
@@ -323,6 +323,8 @@ class ArtifactProcessor {
 
                 // Now try the one in the jaxws subpackage (if cls1 is missing or perhaps
not a JAXB class)
                 if (cls1 == null || !cls1IsJAXB) {
+                    //The founded cls is not a valid JAXB Class, so make sure to set it with
null value
+                    cls1 = null;
                     if (defaultPkg.length() > 0) {
                         defaultValue = defaultPkg + "." + JAXWS_SUBPACKAGE + "." + defaultClassName;
                         if (log.isDebugEnabled()) {



Mime
View raw message