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 na...@apache.org on 2008/08/22 09:41:21 UTC
svn commit: r688008 -
/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
Author: nandana
Date: Fri Aug 22 00:41:21 2008
New Revision: 688008
URL: http://svn.apache.org/viewvc?rev=688008&view=rev
Log:
AXIS2-3974 Applying Detelin's patch with some minor changes, thanks Detelin.
Modified:
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.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=688008&r1=688007&r2=688008&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 Fri Aug 22 00:41:21 2008
@@ -351,6 +351,12 @@
}
}
+ // check for nil attribute:
+ QName nilAttName = new QName(Constants.XSI_NAMESPACE, Constants.NIL, "xsi");
+ if (beanElement.getAttribute(nilAttName) != null) {
+ return null;
+ }
+
if (beanClass.isArray()) {
ArrayList valueList = new ArrayList();
Class arrayClassType = beanClass.getComponentType();
@@ -369,9 +375,8 @@
Object obj = deserialize(arrayClassType,
omElement,
objectSupplier, arrayLocalName);
- if (obj != null) {
- valueList.add(obj);
- }
+
+ valueList.add(obj);
}
}
return ConverterUtil.convertToArray(arrayClassType, valueList);