From 491af32e40beccf899d8c044234a4e681b28af7b Mon Sep 17 00:00:00 2001 From: Musachy Barroso Date: Mon, 28 Sep 2009 16:50:21 +0000 Subject: [PATCH] prevent NPE when value is null git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@819639 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/struts2/views/util/UrlHelper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java b/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java index 9d8e5a7fd..d4972d491 100644 --- a/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java +++ b/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java @@ -36,6 +36,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsConstants; +import org.apache.commons.lang.xwork.StringUtils; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.inject.Container; @@ -234,7 +235,7 @@ public class UrlHelper { link.append(paramSeparator); } } else { - link.append(buildParameterSubstring(name, value.toString())); + link.append(buildParameterSubstring(name, value != null ? value.toString() : StringUtils.EMPTY)); } if (iter.hasNext())