added null checks

This commit is contained in:
Jeremy Long
2015-08-28 05:27:00 -04:00
parent 1d20291d44
commit c41a288280

View File

@@ -24,8 +24,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
/** /**
* An extremely simple wrapper around various escape utils to perform URL and HTML encoding within the reports. This * An extremely simple wrapper around various escape utils to perform URL and HTML encoding within the reports. This class was
* class was created to simplify the velocity configuration and avoid using the "built-in" escape tool. * created to simplify the velocity configuration and avoid using the "built-in" escape tool.
* *
* @author Jeremy Long * @author Jeremy Long
*/ */
@@ -43,6 +43,9 @@ public class EscapeTool {
* @return the URL encoded text * @return the URL encoded text
*/ */
public String url(String text) { public String url(String text) {
if (text == null || text.isEmpty()) {
return text;
}
try { try {
return URLEncoder.encode(text, "UTF-8"); return URLEncoder.encode(text, "UTF-8");
} catch (UnsupportedEncodingException ex) { } catch (UnsupportedEncodingException ex) {
@@ -59,6 +62,9 @@ public class EscapeTool {
* @return the HTML encoded text * @return the HTML encoded text
*/ */
public String html(String text) { public String html(String text) {
if (text == null || text.isEmpty()) {
return text;
}
return StringEscapeUtils.escapeHtml(text); return StringEscapeUtils.escapeHtml(text);
} }
@@ -69,6 +75,9 @@ public class EscapeTool {
* @return the XML encoded text * @return the XML encoded text
*/ */
public String xml(String text) { public String xml(String text) {
if (text == null || text.isEmpty()) {
return text;
}
return StringEscapeUtils.escapeXml(text); return StringEscapeUtils.escapeXml(text);
} }
} }