From fadc9b82d98458cc7e20b5807dd07398bba794d7 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Thu, 3 Jun 2004 09:03:06 +0000 Subject: [PATCH] Other entities may also want to queue up a shutdown. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3015 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../presents/server/PresentsServer.java | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/java/com/threerings/presents/server/PresentsServer.java b/src/java/com/threerings/presents/server/PresentsServer.java index edd9f7661..143545095 100644 --- a/src/java/com/threerings/presents/server/PresentsServer.java +++ b/src/java/com/threerings/presents/server/PresentsServer.java @@ -1,5 +1,5 @@ // -// $Id: PresentsServer.java,v 1.39 2004/02/25 14:45:16 mdb Exp $ +// $Id: PresentsServer.java,v 1.40 2004/06/03 09:03:06 mdb Exp $ package com.threerings.presents.server; @@ -151,11 +151,7 @@ public class PresentsServer public boolean signalReceived (int signo) { // this is called when we receive a ctrl-c - omgr.postUnit(new Runnable() { - public void run () { - shutdown(); - } - }); + queueShutdown(); return true; } @@ -257,6 +253,19 @@ public class PresentsServer invoker.shutdown(); } + /** + * Queues up a request to shutdown on the dobjmgr thread. This method + * may be safely called from any thread. + */ + public void queueShutdown () + { + omgr.postUnit(new Runnable() { + public void run () { + shutdown(); + } + }); + } + /** * Registers an entity that will be notified when the server is * shutting down.