svn commit: r1028438 - in /axis/axis2/java/core/trunk/modules/jaxws: src/org/apache/axis2/jaxws/client/dispatch/BaseDispatch.java test/org/apache/axis2/jaxws/client/dispatch/DispatchOperationResolutio

2010-10-28 Thread barrettj 
Author: barrettj
Date: Thu Oct 28 19:15:02 2010
New Revision: 1028438

URL: http://svn.apache.org/viewvc?rev=1028438&view=rev
Log:
D/L/B messages may have an empty body or a body with no element.  Add unit test 
and dispatch operation resolution code for those cases.

Modified:

axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/client/dispatch/BaseDispatch.java

axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/client/dispatch/DispatchOperationResolutionDocLitBareTest.java

Modified: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/client/dispatch/BaseDispatch.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/client/dispatch/BaseDispatch.java?rev=1028438&r1=1028437&r2=1028438&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/client/dispatch/BaseDispatch.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/client/dispatch/BaseDispatch.java
 Thu Oct 28 19:15:02 2010
@@ -286,35 +286,38 @@ public abstract class BaseDispatch ex
 
QName bodyElementQName) {
 OperationDescription operationDesc = null;
 
-// This logic mimics the code in 
SOAPMessageBodyBasedOperationDispatcher.findOperation.  We will look for
-// the AxisOperation corresponding to the body element name.  Note 
that we are searching for the AxisOperation instead
-// of searching through the OperationDescriptions so that we can use 
the getOperationByMessageElementQName
-// for the Doc/Lit/Bare case.  Once we have the AxisOperation, we'll 
use that to find the Operation Description.
-AxisService axisService = 
endpointInterfaceDesc.getEndpointDescription().getAxisService();
-AxisOperation axisOperation = null;
-
-// Doc/Lit/Wrapped and RPC, the operation name is the first body 
element qname
-axisOperation = axisService.getOperation(new 
QName(bodyElementQName.getLocalPart()));
-
-if (axisOperation == null) {
-// Doc/Lit/Bare, the first body element qname is the element name 
contained in the wsdl:message part
-axisOperation = 
axisService.getOperationByMessageElementQName(bodyElementQName);
-}
-
-if (axisOperation == null) {
-// Not sure why we wouldn't have found the operation above using 
just the localPart rather than the full QName used here,
-// but this is what 
SOAPMessageBodyBasedOperationDispatcher.findOperation does.
-axisOperation = axisService.getOperation(bodyElementQName);
-}
-
-// If we found an axis operation, then find the operation description 
that corresponds to it
-if (axisOperation != null) {
-OperationDescription allOpDescs[] = 
endpointInterfaceDesc.getDispatchableOperations();
-for (OperationDescription checkOpDesc : allOpDescs ) {
-AxisOperation checkAxisOperation = 
checkOpDesc.getAxisOperation();
-if (checkAxisOperation == axisOperation) {
-operationDesc = checkOpDesc;
-break;
+// If there's no bodyElementQName for us to work with, there's nothing 
more we can do.
+if (bodyElementQName != null) {
+// This logic mimics the code in 
SOAPMessageBodyBasedOperationDispatcher.findOperation.  We will look for
+// the AxisOperation corresponding to the body element name.  Note 
that we are searching for the AxisOperation instead
+// of searching through the OperationDescriptions so that we can 
use the getOperationByMessageElementQName
+// for the Doc/Lit/Bare case.  Once we have the AxisOperation, 
we'll use that to find the Operation Description.
+AxisService axisService = 
endpointInterfaceDesc.getEndpointDescription().getAxisService();
+AxisOperation axisOperation = null;
+
+// Doc/Lit/Wrapped and RPC, the operation name is the first body 
element qname
+axisOperation = axisService.getOperation(new 
QName(bodyElementQName.getLocalPart()));
+
+if (axisOperation == null) {
+// Doc/Lit/Bare, the first body element qname is the element 
name contained in the wsdl:message part
+axisOperation = 
axisService.getOperationByMessageElementQName(bodyElementQName);
+}
+
+if (axisOperation == null) {
+// Not sure why we wouldn't have found the operation above 
using just the localPart rather than the full QName used here,
+// but this is what 
SOAPMessageBodyBasedOperationDispatcher.findOperation does.
+axisOperation = axisService.getOperation(bodyEle

svn commit: r1028480 - in /axis/axis2/java/core/branches/1_5: ./ modules/distribution/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kernel/test/org/apache/axis2/transport/http/util

2010-10-28 Thread veithen 
Author: veithen
Date: Thu Oct 28 21:05:12 2010
New Revision: 1028480

URL: http://svn.apache.org/viewvc?rev=1028480&view=rev
Log:
Updated the mergeinfo on the 1.5 branch.

Modified:
axis/axis2/java/core/branches/1_5/   (props changed)
axis/axis2/java/core/branches/1_5/modules/distribution/   (props changed)

axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
   (props changed)

axis/axis2/java/core/branches/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
   (props changed)
axis/axis2/java/core/branches/1_5/modules/parent/   (props changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/   (props 
changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/pom.xml   
(props changed)

axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/
   (props changed)

axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml
   (props changed)
axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/   (props 
changed)

axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/
   (props changed)

axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/
   (props changed)
axis/axis2/java/core/branches/1_5/modules/transport/http/pom.xml   (props 
changed)
axis/axis2/java/core/branches/1_5/modules/transport/http/src/   (props 
changed)
axis/axis2/java/core/branches/1_5/modules/transport/local/   (props changed)

axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
   (props changed)

axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
   (props changed)

Propchange: axis/axis2/java/core/branches/1_5/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 28 21:05:12 2010
@@ -1,2 +1,2 @@
 
/axis/axis2/java/core/trunk:922914,922941,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449,1001279,1001452
-/webservices/axis2/trunk/java:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777648,777882,777897,777934,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,834058,834175,902271,904660,904780,905980
+/webservices/axis2/trunk/java:732924,732927,732939,733539,733776,741873,748761,751964,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777648,777882,777897,777934,778060,780546,783479,795431,801630,803725,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,834058,834175,902271,904660,904780,905980

Propchange: axis/axis2/java/core/branches/1_5/modules/distribution/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 28 21:05:12 2010
@@ -1,2 +1,2 @@
 
/axis/axis2/java/core/trunk/modules/distribution:922914,922941,922983,935169,935174,935338,936434,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990449,1001279,1001452
-/webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148