Author: norman
Date: Thu Aug 6 11:12:55 2009
New Revision: 801600
URL: http://svn.apache.org/viewvc?rev=801600&view=rev
Log:
Fix NPE
Modified:
labs/hupa/src/main/java/org/apache/hupa/shared/data/Util.java
Modified: labs/hupa/src/main/java/org/apache/hupa/shared/data/Util.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/shared/data/Util.java?rev=801600&r1=801599&r2=801600&view=diff
==============================================================================
--- labs/hupa/src/main/java/org/apache/hupa/shared/data/Util.java (original)
+++ labs/hupa/src/main/java/org/apache/hupa/shared/data/Util.java Thu Aug 6
11:12:55 2009
@@ -27,18 +27,22 @@
public final static String STRING_GT = ">";
public final static String HTML_CR = "<br>";
public final static String STRING_CR = "\n";
+
public static String toString(String string) {
- string = string.replaceAll(HTML_LT, STRING_LT);
- string = string.replaceAll(HTML_GT, STRING_GT);
- string = string.replaceAll(HTML_CR, STRING_CR);
-
+ if (string != null) {
+ string = string.replaceAll(HTML_LT, STRING_LT);
+ string = string.replaceAll(HTML_GT, STRING_GT);
+ string = string.replaceAll(HTML_CR, STRING_CR);
+ }
return string;
}
public static String toHtml(String string) {
- string = string.replaceAll(STRING_LT, HTML_LT);
- string = string.replaceAll(STRING_GT, HTML_GT);
- string = string.replaceAll(STRING_CR, HTML_CR);
+ if (string != null) {
+ string = string.replaceAll(STRING_LT, HTML_LT);
+ string = string.replaceAll(STRING_GT, HTML_GT);
+ string = string.replaceAll(STRING_CR, HTML_CR);
+ }
return string;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
