Author: markt
Date: Wed Apr 22 10:12:08 2015
New Revision: 1675310
URL: http://svn.apache.org/r1675310
Log:
Clean-up back-port
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java?rev=1675310&r1=1675309&r2=1675310&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
Wed Apr 22 10:12:08 2015
@@ -114,17 +114,6 @@ public class SingleSignOn extends ValveB
private boolean requireReauthentication = false;
/**
-<<<<<<< .working
- * The cache of single sign on identifiers, keyed by the Session that is
- * associated with them.
- */
- protected Map<SingleSignOnSessionKey,String> reverse =
- new ConcurrentHashMap<SingleSignOnSessionKey,String>();
-
-
- /**
-=======
->>>>>>> .merge-right.r1646757
* Optional SSO cookie domain.
*/
private String cookieDomain;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java?rev=1675310&r1=1675309&r2=1675310&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
Wed Apr 22 10:12:08 2015
@@ -24,7 +24,6 @@ import org.apache.catalina.LifecycleExce
import org.apache.catalina.Session;
import org.apache.catalina.authenticator.SingleSignOn;
import org.apache.catalina.authenticator.SingleSignOnEntry;
-import org.apache.catalina.authenticator.SingleSignOnSessionKey;
import org.apache.catalina.ha.CatalinaCluster;
import org.apache.catalina.ha.ClusterValve;
import org.apache.catalina.tribes.tipis.AbstractReplicatedMap.MapOwner;
@@ -160,8 +159,6 @@ public class ClusterSingleSignOn extends
cache = new ReplicatedMap<String, SingleSignOnEntry>(this,
cluster.getChannel(),
rpcTimeout, cluster.getClusterName() + "-SSO-cache", cls);
- reverse = new ReplicatedMap<SingleSignOnSessionKey, String>(this,
cluster.getChannel(),
- rpcTimeout, cluster.getClusterName() + "-SSO-reverse",
cls);
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
throw new LifecycleException(
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
