Changeset 350 for trunk/JavaHelperLib/src

Timestamp:

01/17/12 11:26:17 (13 years ago)

Author:

sherbold

Message:

• made method StringTools?.xmlEntityReplacement null safe

File:

• trunk/JavaHelperLib/src/de/ugoe/cs/util/StringTools.java (modified) (1 diff)

trunk/JavaHelperLib/src/de/ugoe/cs/util/StringTools.java

@@ -41 +41 @@
         public static String xmlEntityReplacement(String str) {
                 String result = str;
-                result = result.replaceAll("&(?!(?:lt|gt|apos|quot|amp);)", "&");
-                result = result.replaceAll("<", "&lt;");
-                result = result.replaceAll(">", "&gt;");
-                result = result.replaceAll("'", "&apos;");
-                result = result.replaceAll("\"", "&quot;");
+                if (result != null && !"".equals(result)) {
+                        result = result
+                                        .replaceAll("&(?!(?:lt|gt|apos|quot|amp);)", "&amp;");
+                        result = result.replaceAll("<", "&lt;");
+                        result = result.replaceAll(">", "&gt;");
+                        result = result.replaceAll("'", "&apos;");
+                        result = result.replaceAll("\"", "&quot;");
+                }
                 return result;
         }