svn commit: r727180 - /struts/struts1/trunk/core/src/main/java/org/apache/struts/util/RequestUtils.java

[niallp]

Author: niallp
Date: Tue Dec 16 13:54:10 2008
New Revision: 727180

URL: http://svn.apache.org/viewvc?rev=727180&view=rev
Log:
Port Fix for STR-3173 to trunk - NullPointerException in 
org.apache.struts.util.RequestUtils.rationalizeMultipleFileProperty - reported 
by Xavier Poinsard

Modified:
    
struts/struts1/trunk/core/src/main/java/org/apache/struts/util/RequestUtils.java

Modified: 
struts/struts1/trunk/core/src/main/java/org/apache/struts/util/RequestUtils.java
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/util/RequestUtils.java?rev=727180&r1=727179&r2=727180&view=diff
==============================================================================
--- 
struts/struts1/trunk/core/src/main/java/org/apache/struts/util/RequestUtils.java
 (original)
+++ 
struts/struts1/trunk/core/src/main/java/org/apache/struts/util/RequestUtils.java
 Tue Dec 16 13:54:10 2008
@@ -524,6 +524,10 @@
         try {
             Class propertyType = PropertyUtils.getPropertyType(bean, name);
 
+            if (propertyType == null) {
+                return parameterValue;
+            }
+
             if (List.class.isAssignableFrom(propertyType)) {
                 ArrayList list = new ArrayList(1);
                 list.add(formFileValue);