From 81f847022eaa6ca290a18a02de6cee18dbd35be4 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Fri, 18 Oct 2013 07:39:20 +0000 Subject: [PATCH] WW-4182 Adds additional check to avoid NPE git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1533346 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/struts2/views/util/DefaultUrlHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/org/apache/struts2/views/util/DefaultUrlHelper.java b/core/src/main/java/org/apache/struts2/views/util/DefaultUrlHelper.java index 4d7646a0e..460c13830 100644 --- a/core/src/main/java/org/apache/struts2/views/util/DefaultUrlHelper.java +++ b/core/src/main/java/org/apache/struts2/views/util/DefaultUrlHelper.java @@ -214,7 +214,7 @@ public class DefaultUrlHelper implements UrlHelper { 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 UrlHelper { 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);