Author: markt
Date: Tue Jun 14 13:04:43 2011
New Revision: 1135544
URL: http://svn.apache.org/viewvc?rev=1135544&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51315
Removing an authenticator valve triggers an IAE
Patch provided by Violeta Georgieva
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1135544&r1=1135543&r2=1135544&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun 14 13:04:43 2011
@@ -155,13 +155,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko, jung, markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51315
- Removing an authenticator valve triggers an IAE
- Patch provided by Violeta Georgieva
- https://issues.apache.org/bugzilla/show_bug.cgi?id=51315#c0
- +1: markt, kkolinko, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51348
Prevent possible NPE when processing WebDAV locks
https://issues.apache.org/bugzilla/attachment.cgi?id=27140
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1135544&r1=1135543&r2=1135544&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
Tue Jun 14 13:04:43 2011
@@ -273,7 +273,7 @@ public abstract class AuthenticatorBase
*/
public void setContainer(Container container) {
- if (!(container instanceof Context))
+ if (container != null && !(container instanceof Context))
throw new IllegalArgumentException
(sm.getString("authenticator.notContext"));
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1135544&r1=1135543&r2=1135544&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Jun 14 13:04:43 2011
@@ -114,6 +114,10 @@
Correct the SSLValve so it returns the SSL key size as an Integer
rather
than as a String. (markt)
</fix>
+ <fix>
+ <bug>51315</bug>: Fix NPE when removing an authenticator valve from a
+ container. Patch provided by Violeta Georgieva. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
