From 7d8dfff8a1b145ae96f3173bf936d6e12689dafc Mon Sep 17 00:00:00 2001 From: Thomas Schneider Date: Sun, 18 Feb 2007 06:32:02 +0000 Subject: [PATCH] WW-1709 fixed nullpointer when scheme is null git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_2_0_X@508879 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/struts2/views/util/UrlHelper.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 d7823fb58..b149c7f92 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 @@ -103,10 +103,12 @@ public class UrlHelper { link.append("://"); link.append(request.getServerName()); - if ((scheme.equals("http") && (httpPort != DEFAULT_HTTP_PORT)) || (scheme.equals("https") && httpsPort != DEFAULT_HTTPS_PORT)) - { - link.append(":"); - link.append(scheme.equals("http") ? httpPort : httpsPort); + if (scheme != null) { + if ((scheme.equals("http") && (httpPort != DEFAULT_HTTP_PORT)) || (scheme.equals("https") && httpsPort != DEFAULT_HTTPS_PORT)) + { + link.append(":"); + link.append(scheme.equals("http") ? httpPort : httpsPort); + } } } else if (