From aa16d0dc55ab8a8231eeb1b88e71b28c6320ec7c Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 17 Dec 2010 13:52:22 +0000
Subject: [PATCH] Avoid a possible NPE that in turn was masking the root cause
 from JspC

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1050384 13f79535-47bb-0310-9956-ffa450edef68
---
 java/javax/servlet/jsp/tagext/TagLibraryInfo.java | 4 ++--
 webapps/docs/changelog.xml                        | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/java/javax/servlet/jsp/tagext/TagLibraryInfo.java b/java/javax/servlet/jsp/tagext/TagLibraryInfo.java
index af9266ad2..ac9720d1d 100644
--- a/java/javax/servlet/jsp/tagext/TagLibraryInfo.java
+++ b/java/javax/servlet/jsp/tagext/TagLibraryInfo.java
@@ -137,12 +137,12 @@ public abstract class TagLibraryInfo {
     public TagInfo getTag(String shortname) {
         TagInfo tags[] = getTags();
 
-        if (tags == null || tags.length == 0) {
+        if (tags == null || tags.length == 0 || shortname == null) {
             return null;
         }
 
         for (int i = 0; i < tags.length; i++) {
-            if (tags[i].getTagName().equals(shortname)) {
+            if (shortname.equals(tags[i].getTagName())) {
                 return tags[i];
             }
         }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bb54e2d51..b19926acd 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -230,6 +230,10 @@
         removed when the service stops which prevents the service from starting.
         (markt)
       </fix>
+      <fix>
+        <bug>14416</bug>: Make <code>TagLibraryInfo.getTag()</code> more robust
+        at handling <code>null</code>s. (markt)
+      </fix>
     </changelog>
   </subsection>
 </section>
-- 
2.11.0