From 5a3f32a8456941b68166faad156239196c1f9068 Mon Sep 17 00:00:00 2001
From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 4 Jul 2011 13:34:48 +0000
Subject: [PATCH] Fix "potential null pointer access warning".

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1142659 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/util/DOMWriter.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/util/DOMWriter.java b/java/org/apache/catalina/util/DOMWriter.java
index caa13995d..31b9fa122 100644
--- a/java/org/apache/catalina/util/DOMWriter.java
+++ b/java/org/apache/catalina/util/DOMWriter.java
@@ -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);
-- 
2.11.0