Author: kkolinko
Date: Mon Jul 4 13:34:48 2011
New Revision: 1142659
URL: http://svn.apache.org/viewvc?rev=1142659&view=rev
Log:
Fix "potential null pointer access warning".
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=1142659&r1=1142658&r2=1142659&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:34:48 2011
@@ -250,8 +250,11 @@ public class DOMWriter {
/** Returns a sorted list of attributes. */
protected Attr[] sortAttributes(NamedNodeMap attrs) {
+ if (attrs == null) {
+ return new Attr[0];
+ }
- int len = (attrs != null) ? attrs.getLength() : 0;
+ int len = attrs.getLength();
Attr array[] = new Attr[len];
for ( int i = 0; i < len; i++ ) {
array[i] = (Attr)attrs.item(i);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
