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

Tuple.create -> Tuple.newTuple.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5559 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2008-11-18 21:15:43 +00:00
parent 34fd5fda85
commit 034284e103
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/presents/peer/server/PeerManager.java
+3 -3
View File
@@ -295,7 +295,7 @@ public abstract class PeerManager
{ {
for (PeerNode peer : _peers.values()) { for (PeerNode peer : _peers.values()) {
if (peer.nodeobj != null) { 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; return;
} }
final Tuple<String, Integer> key = Tuple.create(nodeName, remoteOid); final Tuple<String, Integer> key = Tuple.newTuple(nodeName, remoteOid);
if (_proxies.containsKey(key)) { if (_proxies.containsKey(key)) {
String errmsg = "Cannot proxy already proxied object [key=" + key + "]."; String errmsg = "Cannot proxy already proxied object [key=" + key + "].";
listener.requestFailed(new ObjectAccessException(errmsg)); listener.requestFailed(new ObjectAccessException(errmsg));
@@ -418,7 +418,7 @@ public abstract class PeerManager
*/ */
public void unproxyRemoteObject (String nodeName, int remoteOid) public void unproxyRemoteObject (String nodeName, int remoteOid)
{ {
Tuple<String,Integer> key = Tuple.create(nodeName, remoteOid); Tuple<String,Integer> key = Tuple.newTuple(nodeName, remoteOid);
Tuple<Subscriber<?>, DObject> bits = _proxies.remove(key); Tuple<Subscriber<?>, DObject> bits = _proxies.remove(key);
if (bits == null) { if (bits == null) {
log.warning("Requested to clear unknown proxy [key=" + key + "]."); log.warning("Requested to clear unknown proxy [key=" + key + "].");
src/java/com/threerings/presents/server/net/ConnectionManager.java
+4 -4
View File
@@ -184,7 +184,7 @@ public class ConnectionManager extends LoopingThread
SocketChannel sockchan = SocketChannel.open(); SocketChannel sockchan = SocketChannel.open();
sockchan.configureBlocking(false); sockchan.configureBlocking(false);
conn.init(this, sockchan, System.currentTimeMillis()); 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."); // log.info("Flattened " + msg + " into " + data.length + " bytes.");
// and slap both on the queue // and slap both on the queue
_outq.append(Tuple.create(conn, data)); _outq.append(Tuple.newTuple(conn, data));
} catch (Exception e) { } catch (Exception e) {
log.warning("Failure flattening message", "conn", conn, "msg", msg, e); log.warning("Failure flattening message", "conn", conn, "msg", msg, e);
@@ -949,7 +949,7 @@ public class ConnectionManager extends LoopingThread
byte[] data = _flattener.toByteArray(); byte[] data = _flattener.toByteArray();
// slap it on the queue // 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) protected void postAsyncClose (Connection conn)
{ {
_outq.append(Tuple.create(conn, ASYNC_CLOSE_REQUEST)); _outq.append(Tuple.newTuple(conn, ASYNC_CLOSE_REQUEST));
} }
/** /**