svn commit: r1178758 - in /axis/axis2/java/core/trunk/modules: adb/src/org/apache/axis2/databinding/utils/BeanUtil.java kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java

[sagara]

Author: sagara
Date: Tue Oct  4 11:35:52 2011
New Revision: 1178758

URL: http://svn.apache.org/viewvc?rev=1178758&view=rev
Log:
Applied patch for AXIS2-5141.

Modified:
    
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
    
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.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=1178758&r1=1178757&r2=1178758&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
 Tue Oct  4 11:35:52 2011
@@ -1095,7 +1095,13 @@ public class BeanUtil {
             *reason to add this block is check is soap sending a string but 
service require Enum
             * then this convert string to relevant enum object and add to 
retObjs[] as object
             * */
-        Object enumIbj = Enum.valueOf(classType , omElement.getText());
+          String paraArgString = omElement.getText();
+         Object enumIbj;
+        if (paraArgString == null || paraArgString.length() == 0) {
+            enumIbj = null;
+        }else{
+            enumIbj = Enum.valueOf(classType , paraArgString);
+        }
         return enumIbj;
 
     }

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java?rev=1178758&r1=1178757&r2=1178758&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
 Tue Oct  4 11:35:52 2011
@@ -2148,9 +2148,9 @@ public class DefaultSchemaGenerator impl
               parameterElement.setName(parameterName);
               if(isArrayType){
                   parameterElement.setMaxOccurs(Long.MAX_VALUE);
-                  parameterElement.setMinOccurs(0);
-                  parameterElement.setNillable(true);
               }
+              parameterElement.setMinOccurs(0);
+              parameterElement.setNillable(true);
               sequence.getItems().add(parameterElement);
               parameterElement.setSchemaTypeName(parameterTypeName);
               return parameterTypeName;