Author: markt
Date: Mon Aug 23 20:15:13 2010
New Revision: 988287
URL: http://svn.apache.org/viewvc?rev=988287&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49670
Fix SSO - broken by Lifecycle refactoring
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=988287&r1=988286&r2=988287&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
Mon Aug 23 20:15:13 2010
@@ -37,7 +37,6 @@ import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.Manager;
-import org.apache.catalina.Pipeline;
import org.apache.catalina.Realm;
import org.apache.catalina.Session;
import org.apache.catalina.Valve;
@@ -841,11 +840,7 @@ public abstract class AuthenticatorBase
// path, if there is one
Container parent = context.getParent();
while ((sso == null) && (parent != null)) {
- if (!(parent instanceof Pipeline)) {
- parent = parent.getParent();
- continue;
- }
- Valve valves[] = ((Pipeline) parent).getValves();
+ Valve valves[] = parent.getPipeline().getValves();
for (int i = 0; i < valves.length; i++) {
if (valves[i] instanceof SingleSignOn) {
sso = (SingleSignOn) valves[i];
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=988287&r1=988286&r2=988287&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Aug 23 20:15:13 2010
@@ -43,6 +43,10 @@
some debug logging to the jar scanner. (rjung)
</update>
<fix>
+ <bug>49670</bug>: Restore SSO functionality that was broken by
Lifecycle
+ refactoring. (markt)
+ </fix>
+ <fix>
<bug>49714</bug>: The annotation process of Jar doesn't influence
distributable element of web.xml. (kfujino)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
