AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch to the ServerCommunicator. I'm sure it'll work just fine!

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5748 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2009-04-27 19:51:06 +00:00
parent a2d6549121
commit da4159c665
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/presents/peer/server/PeerNode.java
+2 -4
View File
@@ -29,7 +29,6 @@ import com.google.inject.Inject;
import com.samskivert.util.ResultListenerList; import com.samskivert.util.ResultListenerList;
import com.threerings.presents.client.BlockingCommunicator;
import com.threerings.presents.client.Client; import com.threerings.presents.client.Client;
import com.threerings.presents.client.ClientObserver; import com.threerings.presents.client.ClientObserver;
import com.threerings.presents.client.Communicator; 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.peer.server.persist.NodeRecord;
import com.threerings.presents.server.PresentsDObjectMgr; import com.threerings.presents.server.PresentsDObjectMgr;
import com.threerings.presents.server.net.ConnectionManager; import com.threerings.presents.server.net.ConnectionManager;
import com.threerings.presents.server.net.ServerCommunicator;
import static com.threerings.presents.Log.log; import static com.threerings.presents.Log.log;
@@ -243,11 +243,9 @@ public class PeerNode
return nodeName1.compareTo(nodeName2) < 0; 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) protected Communicator createCommunicator (Client client)
{ {
// return new ServerCommunicator(client, _conmgr, _omgr); return new ServerCommunicator(client, _conmgr, _omgr);
return new BlockingCommunicator(client);
} }
/** /**