You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by am...@apache.org on 2009/04/28 14:29:48 UTC
svn commit: r769370 - in
/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2:
databinding/utils/BeanUtil.java rpc/receivers/RPCUtil.java
Author: amilas
Date: Tue Apr 28 12:29:47 2009
New Revision: 769370
URL: http://svn.apache.org/viewvc?rev=769370&view=rev
Log:
setting the xsi:type correctly. it is not correct to send the bean class name as the
type since it is not interopratable
Modified:
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=769370&r1=769369&r2=769370&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java (original)
+++ webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java Tue Apr 28 12:29:47 2009
@@ -68,18 +68,13 @@
beanClass, beanName, typeTable, qualified, processingDocLitBare);
ArrayList objectAttributes = new ArrayList();
- objectAttributes.add(new QName(Constants.XSI_NAMESPACE, "type", "xsi"));
- if (typeTable != null && qualified) {
+
+ if ((typeTable != null)){
QName qNamefortheType = typeTable.getQNamefortheType(getClassName(beanClass));
- if (qNamefortheType == null) {
- // Added objectAttributes as a fix for issues AXIS2-2055 and AXIS2-1899 to
- // support polymorphism in POJO approach.
- objectAttributes.add(beanClass.getName());
- } else {
+ if (qNamefortheType != null){
+ objectAttributes.add(new QName(Constants.XSI_NAMESPACE, "type", "xsi"));
objectAttributes.add(qNamefortheType);
}
- } else {
- objectAttributes.add(beanClass.getName());
}
return new ADBXMLStreamReaderImpl(beanName, propertyQnameValueList.toArray(), objectAttributes.toArray(),
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?rev=769370&r1=769369&r2=769370&view=diff
==============================================================================
--- 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 Tue Apr 28 12:29:47 2009
@@ -453,7 +453,7 @@
RPCUtil.processResponse(fac, resObject, bodyContent, ns,
envelope, method,
service.isElementFormDefault(),
- null);
+ service.getTypeTable());
}
}
}