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

google-collect upgrade

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5745 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Charlie Groves
2009-04-24 23:01:40 +00:00
parent 510ddbb717
commit 749ab8e1bb
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/io/Streamer.java
+1 -1
View File
@@ -463,7 +463,7 @@ public class Streamer
// reflect on all the object's fields and remove all marked with NotStreamable // reflect on all the object's fields and remove all marked with NotStreamable
List<Field> fields = Lists.newArrayList(); List<Field> fields = Lists.newArrayList();
ClassUtil.getFields(target, fields); ClassUtil.getFields(target, fields);
_fields = Iterables.newArray(Iterables.filter(fields, _isStreamableFieldPred), Field.class); _fields = Iterables.toArray(Iterables.filter(fields, _isStreamableFieldPred), Field.class);
int fcount = _fields.length; int fcount = _fields.length;
// obtain field marshallers for all of our fields // obtain field marshallers for all of our fields
src/java/com/threerings/presents/server/PresentsSession.java
+1 -1
View File
@@ -251,7 +251,7 @@ public class PresentsSession
*/ */
protected void finishResolved (Name username, ClientObject clobj) { protected void finishResolved (Name username, ClientObject clobj) {
// let the client know that the rug has been yanked out from under their ass // let the client know that the rug has been yanked out from under their ass
Object[] args = new Object[] { Integer.valueOf(clobj.getOid()) }; Object[] args = new Object[] { clobj.getOid() };
_clobj.postMessage(ClientObject.CLOBJ_CHANGED, args); _clobj.postMessage(ClientObject.CLOBJ_CHANGED, args);
// release our old client object; this will destroy it // release our old client object; this will destroy it
src/java/com/threerings/presents/server/ReportManager.java
+2 -2
View File
@@ -21,8 +21,8 @@
package com.threerings.presents.server; package com.threerings.presents.server;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import com.google.common.collect.Multimaps;
import com.google.inject.Singleton; import com.google.inject.Singleton;
import com.samskivert.util.Interval; import com.samskivert.util.Interval;
@@ -185,7 +185,7 @@ public class ReportManager
protected long _lastReportStamp = _serverStartTime; protected long _lastReportStamp = _serverStartTime;
/** Used to generate "state of server" reports. */ /** Used to generate "state of server" reports. */
protected Multimap<String, Reporter> _reporters = Multimaps.newArrayListMultimap(); protected Multimap<String, Reporter> _reporters = ArrayListMultimap.create();
/** The frequency with which we generate "state of server" reports. */ /** The frequency with which we generate "state of server" reports. */
protected static final long REPORT_INTERVAL = 15 * 60 * 1000L; protected static final long REPORT_INTERVAL = 15 * 60 * 1000L;