svn commit: r1142656 - /tomcat/trunk/java/org/apache/catalina/util/DOMWriter.java

[kk...@apache.org]

Author: kkolinko
Date: Mon Jul  4 13:29:44 2011
New Revision: 1142656

URL: http://svn.apache.org/viewvc?rev=1142656&view=rev
Log:
Fix "potential null pointer access warning".
As a bonus, it avoids allocating char[] buffer for an empty string.
Add $FALL-THROUGH$ comment where we fall through to the next label in switch().

Modified:
    tomcat/trunk/java/org/apache/catalina/util/DOMWriter.java

Modified: tomcat/trunk/java/org/apache/catalina/util/DOMWriter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/DOMWriter.java?rev=1142656&r1=1142655&r2=1142656&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/DOMWriter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/DOMWriter.java Mon Jul  4 13:29:44 2011
@@ -290,9 +290,13 @@ public class DOMWriter {
 
    /** Normalizes the given string. */
    protected String normalize(String s) {
+      if (s == null) {
+         return "";
+      }
+
       StringBuilder str = new StringBuilder();
 
-      int len = (s != null) ? s.length() : 0;
+      int len = s.length();
       for ( int i = 0; i < len; i++ ) {
          char ch = s.charAt(i);
          switch ( ch ) {
@@ -322,6 +326,7 @@ public class DOMWriter {
                   }
                   // else, default append char
                }
+            //$FALL-THROUGH$
             default: {
                   str.append(ch);
                }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org