Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

441479 Jetty hangs due to deadlocks in session manager

This commit is contained in:
Jan Bartel 2014-08-13 13:47:30 +10:00
parent aedfb662b6
commit a183219ac8
1 changed files with 37 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSessionManager.java
View File

@ -176,71 +176,63 @@ public abstract class NoSqlSessionManager extends AbstractSessionManager impleme
@Override
protected boolean removeSession(String idInCluster)
{
synchronized (this)
NoSqlSession session = _sessions.remove(idInCluster);
try
{
NoSqlSession session = _sessions.remove(idInCluster);
try
if (session != null)
{
if (session != null)
{
return remove(session);
}
return remove(session);
}
catch (Exception e)
{
__log.warn("Problem deleting session {}", idInCluster,e);
}
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
try
{
if (session == null)
{
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)
{
__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)
{
__log.debug("invalidating session {}", idInCluster);
if (session != null)
{
session.invalidate();
}
}
catch (Exception e)
{
__log.warn("Problem invalidating session {}", idInCluster,e);
session.invalidate();
}
}
catch (Exception e)
{
__log.warn("Problem invalidating session {}", idInCluster,e);
}
}