Author: markt
Date: Fri Dec 17 13:52:22 2010
New Revision: 1050384
URL: http://svn.apache.org/viewvc?rev=1050384&view=rev
Log:
Avoid a possible NPE that in turn was masking the root cause from JspC
Modified:
tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryInfo.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryInfo.java?rev=1050384&r1=1050383&r2=1050384&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryInfo.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryInfo.java Fri Dec 17
13:52:22 2010
@@ -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];
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1050384&r1=1050383&r2=1050384&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Dec 17 13:52:22 2010
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
