From da4159c665a501b34d64cdc1dfb652050aede10e Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Mon, 27 Apr 2009 19:51:06 +0000 Subject: [PATCH] Switch to the ServerCommunicator. I'm sure it'll work just fine! git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5748 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/presents/peer/server/PeerNode.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/java/com/threerings/presents/peer/server/PeerNode.java b/src/java/com/threerings/presents/peer/server/PeerNode.java index 6808121a1..ae88b5be7 100644 --- a/src/java/com/threerings/presents/peer/server/PeerNode.java +++ b/src/java/com/threerings/presents/peer/server/PeerNode.java @@ -29,7 +29,6 @@ import com.google.inject.Inject; import com.samskivert.util.ResultListenerList; -import com.threerings.presents.client.BlockingCommunicator; import com.threerings.presents.client.Client; import com.threerings.presents.client.ClientObserver; import com.threerings.presents.client.Communicator; @@ -50,6 +49,7 @@ import com.threerings.presents.peer.net.PeerBootstrapData; import com.threerings.presents.peer.server.persist.NodeRecord; import com.threerings.presents.server.PresentsDObjectMgr; import com.threerings.presents.server.net.ConnectionManager; +import com.threerings.presents.server.net.ServerCommunicator; import static com.threerings.presents.Log.log; @@ -243,11 +243,9 @@ public class PeerNode return nodeName1.compareTo(nodeName2) < 0; } - // TEMP: allow our communicator to be customized until we sort out our FreeBSD VM problems protected Communicator createCommunicator (Client client) { - // return new ServerCommunicator(client, _conmgr, _omgr); - return new BlockingCommunicator(client); + return new ServerCommunicator(client, _conmgr, _omgr); } /**