Author: markt
Date: Fri Dec 19 14:38:56 2014
New Revision: 1646739
URL: http://svn.apache.org/r1646739
Log:
No longer need a separate lookup() method
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 19 14:38:56 2014
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1646098-1646099,1646302,1646304,1646420
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1646098-1646100,1646302,1646304,1646420
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java?rev=1646739&r1=1646738&r2=1646739&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
Fri Dec 19 14:38:56 2014
@@ -230,7 +230,6 @@ public class SingleSignOn extends ValveB
// associated sessions
deregister(ssoId);
}
-
}
@@ -291,7 +290,7 @@ public class SingleSignOn extends ValveB
if (containerLog.isDebugEnabled()) {
containerLog.debug(" Checking for cached principal for " +
cookie.getValue());
}
- SingleSignOnEntry entry = lookup(cookie.getValue());
+ SingleSignOnEntry entry = cache.get(cookie.getValue());
if (entry != null) {
if (containerLog.isDebugEnabled()) {
containerLog.debug(" Found cached principal '" +
@@ -333,7 +332,6 @@ public class SingleSignOn extends ValveB
// Invoke the next Valve in our pipeline
getNext().invoke(request, response);
-
}
@@ -352,7 +350,7 @@ public class SingleSignOn extends ValveB
containerLog.debug("Associate sso id " + ssoId + " with session "
+ session);
}
- SingleSignOnEntry sso = lookup(ssoId);
+ SingleSignOnEntry sso = cache.get(ssoId);
if (sso != null) {
sso.addSession(this, session);
}
@@ -371,7 +369,7 @@ public class SingleSignOn extends ValveB
reverse.remove(session);
- SingleSignOnEntry sso = lookup(ssoId);
+ SingleSignOnEntry sso = cache.get(ssoId);
if (sso == null) {
return;
}
@@ -454,7 +452,7 @@ public class SingleSignOn extends ValveB
boolean reauthenticated = false;
- SingleSignOnEntry entry = lookup(ssoId);
+ SingleSignOnEntry entry = cache.get(ssoId);
if (entry != null && entry.getCanReauthenticate()) {
String username = entry.getUsername();
@@ -525,7 +523,7 @@ public class SingleSignOn extends ValveB
protected void update(String ssoId, Principal principal, String authType,
String username, String password) {
- SingleSignOnEntry sso = lookup(ssoId);
+ SingleSignOnEntry sso = cache.get(ssoId);
if (sso != null && !sso.getCanReauthenticate()) {
if (containerLog.isDebugEnabled()) {
containerLog.debug("Update sso id " + ssoId + " to auth type "
+ authType);
@@ -534,23 +532,11 @@ public class SingleSignOn extends ValveB
synchronized(sso) {
sso.updateCredentials(principal, authType, username, password);
}
-
}
}
/**
- * Look up and return the cached SingleSignOn entry associated with this
- * sso id value, if there is one; otherwise return <code>null</code>.
- *
- * @param ssoId Single sign on identifier to look up
- */
- protected SingleSignOnEntry lookup(String ssoId) {
- return cache.get(ssoId);
- }
-
-
- /**
* Remove a single Session from a SingleSignOn. Called when
* a session is timed out and no longer active.
*
@@ -565,7 +551,7 @@ public class SingleSignOn extends ValveB
}
// Get a reference to the SingleSignOn
- SingleSignOnEntry entry = lookup(ssoId);
+ SingleSignOnEntry entry = cache.get(ssoId);
if (entry == null) {
return;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
