From 14307d729275195a519afd388a74f0ded6956245 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Wed, 26 Nov 2008 23:57:17 +0000 Subject: [PATCH] Break out communicator creation into an overridable method temporarily. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5569 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../threerings/presents/peer/server/PeerNode.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/java/com/threerings/presents/peer/server/PeerNode.java b/src/java/com/threerings/presents/peer/server/PeerNode.java index b9f959a44..b65598c43 100644 --- a/src/java/com/threerings/presents/peer/server/PeerNode.java +++ b/src/java/com/threerings/presents/peer/server/PeerNode.java @@ -62,6 +62,7 @@ public class PeerNode { _peermgr = peermgr; _omgr = omgr; + _conmgr = conmgr; _record = record; _client = new Client(null, _omgr) { @Override protected void convertFromRemote (DObject target, DEvent event) { @@ -75,8 +76,7 @@ public class PeerNode event.eventId = PeerNode.this._omgr.getNextEventId(true); } @Override protected Communicator createCommunicator () { - // return new ServerCommunicator(this, conmgr, omgr); - return new BlockingCommunicator(this); + return PeerNode.this.createCommunicator(this); } }; _client.addClientObserver(this); @@ -268,8 +268,16 @@ 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); + } + protected PeerManager _peermgr; protected PresentsDObjectMgr _omgr; + protected ConnectionManager _conmgr; protected NodeRecord _record; protected Client _client; protected long _lastConnectStamp;