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

Issue #3361 thread safe addHandler 

Improved names and javadoc.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
This commit is contained in:
Greg Wilkins 2019-03-20 18:36:48 +11:00
parent 1accced62f
commit 338f56ea93
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandlerCollection.java
View File

@ -260,12 +260,15 @@ public class ContextHandlerCollection extends HandlerCollection
* This method is the equivalent of {@link #addHandler(Handler)},
* but its execution is non-block and mutually excluded from all
* other calls to {@link #deployHandler(Handler)} and
* {@link #undeployHandler(Handler)}
* {@link #undeployHandler(Handler)}.
* The handler may be added after this call returns.
* </p>
* @param handler the handler to deploy
*/
public void deployHandler(Handler handler)
{
if (handler.getServer()!=getServer())
handler.setServer(getServer());
_serializedExecutor.execute(()-> addHandler(handler));
}
@ -277,7 +280,8 @@ public class ContextHandlerCollection extends HandlerCollection
* This method is the equivalent of {@link #removeHandler(Handler)},
* but its execution is non-block and mutually excluded from all
* other calls to {@link #deployHandler(Handler)} and
* {@link #undeployHandler(Handler)}
* {@link #undeployHandler(Handler)}.
* The handler may be removed after this call returns.
* </p>
* @param handler The handler to undeploy
*/

8
jetty-util/src/main/java/org/eclipse/jetty/util/thread/SerializedExecutor.java
View File

@ -37,13 +37,13 @@ import org.eclipse.jetty.util.log.Log;
*/
public class SerializedExecutor implements Executor
{
final AtomicReference<Link> _tail = new AtomicReference<>();
final AtomicReference<Link> _last = new AtomicReference<>();
@Override
public void execute(Runnable task)
{
Link link = new Link(task);
Link secondLast = _tail.getAndSet(link);
Link secondLast = _last.getAndSet(link);
if (secondLast==null)
run(link);
else
@ -69,8 +69,8 @@ public class SerializedExecutor implements Executor
}
finally
{
// Are we the current the last Link?
if (_tail.compareAndSet(link, null))
// Are we the current last Link?
if (_last.compareAndSet(link, null))
return;
// not the last task, so its next link will eventually be set