Author: markt
Date: Fri Dec 19 14:38:20 2014
New Revision: 1646738
URL: http://svn.apache.org/r1646738
Log:
Switch to ConcurrentHashMap and remove syncs
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:20 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,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-1646099,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=1646738&r1=1646737&r2=1646738&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:20 2014
@@ -18,8 +18,8 @@ package org.apache.catalina.authenticato
import java.io.IOException;
import java.security.Principal;
-import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import javax.servlet.ServletException;
import javax.servlet.http.Cookie;
@@ -66,8 +66,7 @@ public class SingleSignOn extends ValveB
* The cache of SingleSignOnEntry instances for authenticated Principals,
* keyed by the cookie value that is used to select them.
*/
- protected final Map<String,SingleSignOnEntry> cache = new HashMap<>();
-
+ protected final Map<String,SingleSignOnEntry> cache = new
ConcurrentHashMap<>();
/**
* Indicates whether this valve should require a downstream Authenticator
to
@@ -80,7 +79,7 @@ public class SingleSignOn extends ValveB
* The cache of single sign on identifiers, keyed by the Session that is
* associated with them.
*/
- protected final Map<Session,String> reverse = new HashMap<>();
+ protected final Map<Session,String> reverse = new ConcurrentHashMap<>();
/**
@@ -210,9 +209,7 @@ public class SingleSignOn extends ValveB
}
String ssoId = null;
- synchronized (reverse) {
- ssoId = reverse.get(session);
- }
+ ssoId = reverse.get(session);
if (ssoId == null) {
return;
}
@@ -359,10 +356,7 @@ public class SingleSignOn extends ValveB
if (sso != null) {
sso.addSession(this, session);
}
- synchronized (reverse) {
- reverse.put(session, ssoId);
- }
-
+ reverse.put(session, ssoId);
}
@@ -375,9 +369,7 @@ public class SingleSignOn extends ValveB
*/
protected void deregister(String ssoId, Session session) {
- synchronized (reverse) {
- reverse.remove(session);
- }
+ reverse.remove(session);
SingleSignOnEntry sso = lookup(ssoId);
if (sso == null) {
@@ -389,11 +381,8 @@ public class SingleSignOn extends ValveB
// see if we are the last session, if so blow away ssoId
Session sessions[] = sso.findSessions();
if (sessions == null || sessions.length == 0) {
- synchronized (cache) {
- cache.remove(ssoId);
- }
+ cache.remove(ssoId);
}
-
}
@@ -410,10 +399,7 @@ public class SingleSignOn extends ValveB
}
// Look up and remove the corresponding SingleSignOnEntry
- SingleSignOnEntry sso = null;
- synchronized (cache) {
- sso = cache.remove(ssoId);
- }
+ SingleSignOnEntry sso = cache.remove(ssoId);
if (sso == null) {
return;
@@ -426,9 +412,7 @@ public class SingleSignOn extends ValveB
containerLog.trace(" Invalidating session " + sessions[i]);
}
// Remove from reverse cache first to avoid recursion
- synchronized (reverse) {
- reverse.remove(sessions[i]);
- }
+ reverse.remove(sessions[i]);
// Invalidate this session
sessions[i].expire();
}
@@ -509,11 +493,7 @@ public class SingleSignOn extends ValveB
(principal != null ? principal.getName() : "") + "' with auth
type '" + authType + "'");
}
- synchronized (cache) {
- cache.put(ssoId, new SingleSignOnEntry(principal, authType,
- username, password));
- }
-
+ cache.put(ssoId, new SingleSignOnEntry(principal, authType, username,
password));
}
@@ -566,11 +546,7 @@ public class SingleSignOn extends ValveB
* @param ssoId Single sign on identifier to look up
*/
protected SingleSignOnEntry lookup(String ssoId) {
-
- synchronized (cache) {
- return cache.get(ssoId);
- }
-
+ return cache.get(ssoId);
}
@@ -598,9 +574,7 @@ public class SingleSignOn extends ValveB
entry.removeSession(session);
// Remove the inactive session from the 'reverse' Map.
- synchronized(reverse) {
- reverse.remove(session);
- }
+ reverse.remove(session);
// If there are not sessions left in the SingleSignOnEntry,
// deregister the entry.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
