Author: deepal
Date: Mon Jun 11 04:32:24 2007
New Revision: 546101
URL: http://svn.apache.org/viewvc?view=rev&rev=546101
Log:
fixing https://issues.apache.org/jira/browse/AXIS2-2772
no we do not send a return element if the array size is zero.
Modified:
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/AddressServiceTest.java
Modified:
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java?view=diff&rev=546101&r1=546100&r2=546101
==============================================================================
---
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
(original)
+++
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
Mon Jun 11 04:32:24 2007
@@ -153,26 +153,7 @@
envelope.getBody().addChild(bodyChild);
} else {
if (resObject instanceof Object[]) {
- if(Array.getLength(resObject)==0){
- QName resName;
- if (service.isElementFormDefault()) {
- resName = new QName(service.getSchematargetNamespace(),
- RETURN_WRAPPER,
-
service.getSchemaTargetNamespacePrefix());
- } else {
- resName = new QName(RETURN_WRAPPER);
- }
- XMLStreamReader xr = new NullXMLStreamReader(resName);
- StreamWrapper parser = new StreamWrapper(xr);
- StAXOMBuilder stAXOMBuilder =
- OMXMLBuilderFactory.createStAXOMBuilder(
- OMAbstractFactory.getSOAP11Factory(),
parser);
- ns =
fac.createOMNamespace(service.getSchematargetNamespace(),
-
service.getSchemaTargetNamespacePrefix());
- OMElement bodyChild = fac.createOMElement(method.getName()
+ "Response", ns);
- bodyChild.addChild(stAXOMBuilder.getDocumentElement());
- envelope.getBody().addChild(bodyChild);
- } else {
+
QName resName = new QName(elementQName.getNamespaceURI(),
method.getName() + "Response",
elementQName.getPrefix());
@@ -181,7 +162,6 @@
service.isElementFormDefault(),
service.getTypeTable());
envelope.getBody().addChild(bodyChild);
- }
} else {
if (resObject.getClass().isArray()) {
int length = Array.getLength(resObject);
Modified:
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/AddressServiceTest.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/AddressServiceTest.java?view=diff&rev=546101&r1=546100&r2=546101
==============================================================================
---
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/AddressServiceTest.java
(original)
+++
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/AddressServiceTest.java
Mon Jun 11 04:32:24 2007
@@ -107,7 +107,7 @@
Object[] result = serviceClient.invokeBlocking(opAddEntry,
opAddEntryArgs, new Class[]{Entry[].class});
assertNotNull(result);
Entry[] entries = (Entry[]) result[0];
- assertEquals(entries.length, 1);
+ assertEquals(entries.length, 0);
}
public void testEntry3() throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
