Author: sagara
Date: Sun Jul 24 18:17:20 2011
New Revision: 1150452
URL: http://svn.apache.org/viewvc?rev=1150452&view=rev
Log:
Fixed ComplexDataTypesDocLitBareTest failure.
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/Constants.java
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/rpc/complex/ComplexDataTypesDocLitBareTest.java
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=1150452&r1=1150451&r2=1150452&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
Sun Jul 24 18:17:20 2011
@@ -251,9 +251,16 @@ public class BeanUtil {
for (Object o : (Object[]) value) {
addTypeQname(elemntNameSpace,
propertyQnameValueList,
property, beanName,
processingDocLitBare);
- QName propertyQName = new
QName(elemntNameSpace.getNamespaceURI(),
-
propertyName,
-
elemntNameSpace.getPrefix());
+ QName propertyQName = null;
+ if (elemntNameSpace != null) {
+ propertyQName = new QName(
+ elemntNameSpace.getNamespaceURI(),
+ propertyName,
+ elemntNameSpace.getPrefix());
+ } else {
+ propertyQName = new QName(propertyName);
+
+ }
if
(SimpleTypeMapper
.isObjectArray(o.getClass())
@@ -267,7 +274,7 @@ public class BeanUtil {
* For inner Arrary
Complex types we use the special local name array - "array"
*/
QName itemName = new
QName(elemntNameSpace.getNamespaceURI(),
-
Constants.INNTER_ARRARY_COMPLEX_TYPE_NAME,
+
Constants.INNER_ARRAY_COMPLEX_TYPE_NAME,
elemntNameSpace.getPrefix());
propertyQnameValueList.add(getOMElement(propertyQName , (Object[]) o,
itemName, qualified, typeTable));
@@ -1121,7 +1128,7 @@ public class BeanUtil {
* For inner Arrary Complex
types we use the special local name array - "array"
*/
QName itemName = new
QName(partName.getNamespaceURI(),
-
Constants.INNTER_ARRARY_COMPLEX_TYPE_NAME,
+
Constants.INNER_ARRAY_COMPLEX_TYPE_NAME,
partName.getPrefix());
objects.add(getOMElement(partName, (Object[]) arg,
itemName,
qualifed, typeTable));
@@ -1823,7 +1830,7 @@ public class BeanUtil {
valueType,
(Collection) value,
elementName,
- Constants.INNTER_ARRARY_COMPLEX_TYPE_NAME,
+ Constants.INNER_ARRAY_COMPLEX_TYPE_NAME,
new QName(ns.getNamespaceURI(), elementName,
ns.getPrefix()),
typeTable, elementFormDefault);
} else if (SimpleTypeMapper.isObjectType((Class) valueType)) {
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/Constants.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/Constants.java?rev=1150452&r1=1150451&r2=1150452&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/Constants.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/Constants.java
Sun Jul 24 18:17:20 2011
@@ -33,7 +33,7 @@ public interface Constants {
static String DEFAULT_XSI_NAMESPACE_PREFIX = "xsi";
static String DEFAULT_XSD_NAMESPACE_PREFIX = "xs";
- public static String INNTER_ARRARY_COMPLEX_TYPE_NAME = "array";
+ public static String INNER_ARRAY_COMPLEX_TYPE_NAME = "array";
public static String RETURN_WRAPPER = "return";
static Object OM_ATTRIBUTE_KEY = new OMAttribKey();
Modified:
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/rpc/complex/ComplexDataTypesDocLitBareTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/rpc/complex/ComplexDataTypesDocLitBareTest.java?rev=1150452&r1=1150451&r2=1150452&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/rpc/complex/ComplexDataTypesDocLitBareTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/rpc/complex/ComplexDataTypesDocLitBareTest.java
Sun Jul 24 18:17:20 2011
@@ -35,6 +35,7 @@ import org.apache.axis2.engine.AxisConfi
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.integration.UtilServerBasedTestCase;
import org.tempuri.complex.ComplexDataTypesDocLitBareStub;
+import
org.tempuri.complex.ComplexDataTypesDocLitBareStub.RetArrayString2DResult;
import javax.activation.DataHandler;
import javax.xml.namespace.QName;
@@ -160,7 +161,10 @@ public class ComplexDataTypesDocLitBareT
a1.setString(new String[]{"foo", "bar"});
input.setArrayOfstring(new
ComplexDataTypesDocLitBareStub.ArrayOfstring[]{a1, a2});
req.setInArrayString2D(input);
- assertNotNull(stub.retArrayString2D(req));
+ RetArrayString2DResult res = stub.retArrayString2D(req);
+ assertNotNull(res);
+ assertEquals("foo",
res.getRetArrayString2DResult().getArrayOfstring()[0].getString()[0]);
+ assertEquals("bar",
res.getRetArrayString2DResult().getArrayOfstring()[0].getString()[1]);
}
/**
