Presents supports streaming lists natively now, so just use an array list.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5254 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2008-07-22 15:06:36 +00:00
parent 0a893e1de1
commit dde4e4bfdf
2 changed files with 7 additions and 5 deletions
@@ -21,8 +21,9 @@
package com.threerings.presents.net;
import java.util.List;
import com.threerings.io.SimpleStreamableObject;
import com.threerings.util.StreamableArrayList;
import com.threerings.presents.data.InvocationMarshaller;
@@ -40,5 +41,5 @@ public class BootstrapData extends SimpleStreamableObject
public int clientOid;
/** A list of handles to invocation services. */
public StreamableArrayList<InvocationMarshaller> services;
public List<InvocationMarshaller> services;
}
@@ -26,13 +26,14 @@ import java.net.InetAddress;
import java.util.Map;
import java.util.TimeZone;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.inject.Inject;
import com.samskivert.util.HashIntMap;
import com.samskivert.util.ResultListener;
import com.samskivert.util.Throttle;
import com.threerings.util.Name;
import com.threerings.util.StreamableArrayList;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.data.InvocationMarshaller;
@@ -676,11 +677,11 @@ public class PresentsClient
data.clientOid = _clobj.getOid();
// fill in the list of bootstrap services
data.services = new StreamableArrayList<InvocationMarshaller>();
if (_areq.getBootGroups() == null) {
log.warning("Client provided no invocation service boot groups? " + this);
data.services = Lists.newArrayList();
} else {
data.services.addAll(_invmgr.getBootstrapServices(_areq.getBootGroups()));
data.services = _invmgr.getBootstrapServices(_areq.getBootGroups());
}
}