From 034284e103849b03b161dc3069453b7bf8099cab Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Tue, 18 Nov 2008 21:15:43 +0000 Subject: [PATCH] Tuple.create -> Tuple.newTuple. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5559 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../com/threerings/presents/peer/server/PeerManager.java | 6 +++--- .../threerings/presents/server/net/ConnectionManager.java | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/java/com/threerings/presents/peer/server/PeerManager.java b/src/java/com/threerings/presents/peer/server/PeerManager.java index 3c4a6afaf..930331ed9 100644 --- a/src/java/com/threerings/presents/peer/server/PeerManager.java +++ b/src/java/com/threerings/presents/peer/server/PeerManager.java @@ -295,7 +295,7 @@ public abstract class PeerManager { for (PeerNode peer : _peers.values()) { if (peer.nodeobj != null) { - func.apply(Tuple.create(peer.getClient(), peer.nodeobj)); + func.apply(Tuple.newTuple(peer.getClient(), peer.nodeobj)); } } } @@ -389,7 +389,7 @@ public abstract class PeerManager return; } - final Tuple key = Tuple.create(nodeName, remoteOid); + final Tuple key = Tuple.newTuple(nodeName, remoteOid); if (_proxies.containsKey(key)) { String errmsg = "Cannot proxy already proxied object [key=" + key + "]."; listener.requestFailed(new ObjectAccessException(errmsg)); @@ -418,7 +418,7 @@ public abstract class PeerManager */ public void unproxyRemoteObject (String nodeName, int remoteOid) { - Tuple key = Tuple.create(nodeName, remoteOid); + Tuple key = Tuple.newTuple(nodeName, remoteOid); Tuple, DObject> bits = _proxies.remove(key); if (bits == null) { log.warning("Requested to clear unknown proxy [key=" + key + "]."); diff --git a/src/java/com/threerings/presents/server/net/ConnectionManager.java b/src/java/com/threerings/presents/server/net/ConnectionManager.java index 4ced3a931..9747facc8 100644 --- a/src/java/com/threerings/presents/server/net/ConnectionManager.java +++ b/src/java/com/threerings/presents/server/net/ConnectionManager.java @@ -184,7 +184,7 @@ public class ConnectionManager extends LoopingThread SocketChannel sockchan = SocketChannel.open(); sockchan.configureBlocking(false); conn.init(this, sockchan, System.currentTimeMillis()); - _connectq.append(Tuple.create(conn, new InetSocketAddress(hostname, port))); + _connectq.append(Tuple.newTuple(conn, new InetSocketAddress(hostname, port))); } /** @@ -926,7 +926,7 @@ public class ConnectionManager extends LoopingThread // log.info("Flattened " + msg + " into " + data.length + " bytes."); // and slap both on the queue - _outq.append(Tuple.create(conn, data)); + _outq.append(Tuple.newTuple(conn, data)); } catch (Exception e) { log.warning("Failure flattening message", "conn", conn, "msg", msg, e); @@ -949,7 +949,7 @@ public class ConnectionManager extends LoopingThread byte[] data = _flattener.toByteArray(); // slap it on the queue - _dataq.append(Tuple.create(conn, data)); + _dataq.append(Tuple.newTuple(conn, data)); } /** @@ -962,7 +962,7 @@ public class ConnectionManager extends LoopingThread */ protected void postAsyncClose (Connection conn) { - _outq.append(Tuple.create(conn, ASYNC_CLOSE_REQUEST)); + _outq.append(Tuple.newTuple(conn, ASYNC_CLOSE_REQUEST)); } /**