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
This commit is contained in:
Michael Bayne
2008-11-26 23:57:17 +00:00
parent adf11c5381
commit 14307d7292
@@ -62,6 +62,7 @@ public class PeerNode
{ {
_peermgr = peermgr; _peermgr = peermgr;
_omgr = omgr; _omgr = omgr;
_conmgr = conmgr;
_record = record; _record = record;
_client = new Client(null, _omgr) { _client = new Client(null, _omgr) {
@Override protected void convertFromRemote (DObject target, DEvent event) { @Override protected void convertFromRemote (DObject target, DEvent event) {
@@ -75,8 +76,7 @@ public class PeerNode
event.eventId = PeerNode.this._omgr.getNextEventId(true); event.eventId = PeerNode.this._omgr.getNextEventId(true);
} }
@Override protected Communicator createCommunicator () { @Override protected Communicator createCommunicator () {
// return new ServerCommunicator(this, conmgr, omgr); return PeerNode.this.createCommunicator(this);
return new BlockingCommunicator(this);
} }
}; };
_client.addClientObserver(this); _client.addClientObserver(this);
@@ -268,8 +268,16 @@ 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)
{
// return new ServerCommunicator(client, _conmgr, _omgr);
return new BlockingCommunicator(client);
}
protected PeerManager _peermgr; protected PeerManager _peermgr;
protected PresentsDObjectMgr _omgr; protected PresentsDObjectMgr _omgr;
protected ConnectionManager _conmgr;
protected NodeRecord _record; protected NodeRecord _record;
protected Client _client; protected Client _client;
protected long _lastConnectStamp; protected long _lastConnectStamp;