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

Issue #123 

Make sync on id generation more tightly scoped.
This commit is contained in:
Jan Bartel 2016-12-08 11:29:13 +11:00
parent be3085d5f7
commit 8e0725db1c
1 changed files with 65 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionIdManager.java
View File

@ -30,7 +30,6 @@ import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.SessionIdManager; import org.eclipse.jetty.server.SessionIdManager;
import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.util.component.AbstractLifeCycle;
import org.eclipse.jetty.util.component.ContainerLifeCycle; import org.eclipse.jetty.util.component.ContainerLifeCycle;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.Logger;
@ -208,8 +207,6 @@ public class DefaultSessionIdManager extends ContainerLifeCycle implements Sessi
*/ */
@Override @Override
public String newSessionId(HttpServletRequest request, long created) public String newSessionId(HttpServletRequest request, long created)
{
synchronized (this)
{ {
if (request==null) if (request==null)
return newSessionId(created); return newSessionId(created);
@ -235,7 +232,8 @@ public class DefaultSessionIdManager extends ContainerLifeCycle implements Sessi
request.setAttribute(__NEW_SESSION_ID,id); request.setAttribute(__NEW_SESSION_ID,id);
return id; return id;
} }
}
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
/** /**
@ -246,6 +244,9 @@ public class DefaultSessionIdManager extends ContainerLifeCycle implements Sessi
{ {
// pick a new unique ID! // pick a new unique ID!
String id=null; String id=null;
synchronized (_random)
{
while (id==null||id.length()==0) while (id==null||id.length()==0)
{ {
long r0=_weakRandom long r0=_weakRandom
@ -286,6 +287,7 @@ public class DefaultSessionIdManager extends ContainerLifeCycle implements Sessi
id = id+Long.toString(COUNTER.getAndIncrement()); id = id+Long.toString(COUNTER.getAndIncrement());
} }
}
return id; return id;
} }