svn commit: r1533346 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/DefaultUrlHelper.java

[lukaszlenart]

Author: lukaszlenart
Date: Fri Oct 18 07:39:20 2013
New Revision: 1533346

URL: http://svn.apache.org/r1533346
Log:
WW-4182 Adds additional check to avoid NPE

Modified:
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/DefaultUrlHelper.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/DefaultUrlHelper.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/DefaultUrlHelper.java?rev=1533346&r1=1533345&r2=1533346&view=diff
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/DefaultUrlHelper.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/DefaultUrlHelper.java
 Fri Oct 18 07:39:20 2013
@@ -214,7 +214,7 @@ public class DefaultUrlHelper implements
                 if (value instanceof Iterable) {
                     for (Iterator iterator = ((Iterable) value).iterator(); 
iterator.hasNext();) {
                         Object paramValue = iterator.next();
-                        link.append(buildParameterSubstring(name, 
paramValue.toString()));
+                        link.append(buildParameterSubstring(name, paramValue 
!= null ? paramValue.toString() : StringUtils.EMPTY));
 
                         if (iterator.hasNext()) {
                             link.append(paramSeparator);
@@ -224,7 +224,7 @@ public class DefaultUrlHelper implements
                     Object[] array = (Object[]) value;
                     for (int i = 0; i < array.length; i++) {
                         Object paramValue = array[i];
-                        link.append(buildParameterSubstring(name, 
paramValue.toString()));
+                        link.append(buildParameterSubstring(name, paramValue 
!= null ? paramValue.toString() : StringUtils.EMPTY));
 
                         if (i < array.length - 1) {
                             link.append(paramSeparator);