Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49670

Fix SSO - broken by Lifecycle refactoring

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@988287 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index a21c577..a9b282b 100644 (file)
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -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 extends ValveBase
         // 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];

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 73c1f78..66c56fb 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -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>