svn commit: r1240018 - /axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java

[sagara]

Author: sagara
Date: Fri Feb  3 07:22:02 2012
New Revision: 1240018

URL: http://svn.apache.org/viewvc?rev=1240018&view=rev
Log:
Fixed NullPointerException when returning a null as a value of a Collection or 
Map. 

Modified:
    
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.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=1240018&r1=1240017&r2=1240018&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
 Fri Feb  3 07:22:02 2012
@@ -292,7 +292,7 @@ public class BeanUtil {
                             propertyQnameValueList.add(value);
                         }
                     }
-                } else  if (SimpleTypeMapper.isCollection(ptype)) { 
+                } else  if (SimpleTypeMapper.isCollection(ptype) && value != 
null) { 
                     if (typeTable != null) {
                        OMFactory fac = OMAbstractFactory.getOMFactory();       
                                
                        QName qNamefortheType = null;                           
        
@@ -339,7 +339,7 @@ public class BeanUtil {
                     }
                           
                                                                        
-                } else if (SimpleTypeMapper.isMap(ptype)) {
+                } else if (SimpleTypeMapper.isMap(ptype) && value != null) {
                                        OMFactory fac = 
OMAbstractFactory.getOMFactory();
                                        QName qNamefortheType = (QName) 
typeTable
                                                        
.getComplexSchemaMap().get(getClassName(beanClass));