Merge remote-tracking branch 'origin/master' into jetty-http2

Conflicts:
	jetty-distribution/pom.xml

1 files changed, 37 insertions, 45 deletions

diff --git a/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSessionManager.java b/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSessionManager.java
index c9f93fd710..606bc0dc80 100644
--- a/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSessionManager.java
+++ b/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSessionManager.java
@@ -176,71 +176,63 @@ public abstract class NoSqlSessionManager extends AbstractSessionManager impleme
     @Override
     protected boolean removeSession(String idInCluster)
     {
-        synchronized (this)
-        {
-            NoSqlSession session = _sessions.remove(idInCluster);
+        NoSqlSession session = _sessions.remove(idInCluster);
 
-            try
-            {
-                if (session != null)
-                {
-                    return remove(session);
-                }
-            }
-            catch (Exception e)
+        try
+        {
+            if (session != null)
             {
-                __log.warn("Problem deleting session {}", idInCluster,e);
+                return remove(session);
             }
-
-            return session != null;
         }
+        catch (Exception e)
+        {
+            __log.warn("Problem deleting session {}", idInCluster,e);
+        }
+
+        return session != null;
+
     }
 
     /* ------------------------------------------------------------ */
     protected void expire( String idInCluster )
     {
-        synchronized (this)
-        {
-            //get the session from memory
-            NoSqlSession session = _sessions.get(idInCluster);
+        //get the session from memory
+        NoSqlSession session = _sessions.get(idInCluster);
 
-            try
-            {
-                if (session == null)
-                {
-                    //we need to expire the session with its listeners, so load it
-                    session = loadSession(idInCluster);
-                }
-               
-                if (session != null)
-                    session.timeout();
-            }
-            catch (Exception e)
+        try
+        {
+            if (session == null)
             {
-                __log.warn("Problem expiring session {}", idInCluster,e);
+                //we need to expire the session with its listeners, so load it
+                session = loadSession(idInCluster);
             }
+
+            if (session != null)
+                session.timeout();
+        }
+        catch (Exception e)
+        {
+            __log.warn("Problem expiring session {}", idInCluster,e);
         }
     }
-    
-    
+
+
     public void invalidateSession (String idInCluster)
     {
-        synchronized (this)
+        NoSqlSession session = _sessions.get(idInCluster);
+        try
         {
-            NoSqlSession session = _sessions.get(idInCluster);
-            try
-            {
-                __log.debug("invalidating session {}", idInCluster);
-                if (session != null)
-                {
-                    session.invalidate();
-                }
-            }
-            catch (Exception e)
+            __log.debug("invalidating session {}", idInCluster);
+            if (session != null)
             {
-                __log.warn("Problem invalidating session {}", idInCluster,e); 
+                session.invalidate();
             }
         }
+        catch (Exception e)
+        {
+            __log.warn("Problem invalidating session {}", idInCluster,e); 
+        }
     }