From 1b29e41129f92e3438c7094d45e0badeee2b5c3d Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Tue, 22 Jul 2008 18:29:06 +0000 Subject: [PATCH] BootstrapData.services is now a plain old array. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5256 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/as/com/threerings/presents/client/Client.as | 2 +- src/as/com/threerings/presents/net/BootstrapData.as | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/as/com/threerings/presents/client/Client.as b/src/as/com/threerings/presents/client/Client.as index 9a71cfa24..3c6393968 100644 --- a/src/as/com/threerings/presents/client/Client.as +++ b/src/as/com/threerings/presents/client/Client.as @@ -211,7 +211,7 @@ public class Client extends EventDispatcher public function getService (clazz :Class) :InvocationService { if (_bstrap != null) { - for each (var isvc :InvocationService in _bstrap.services.asArray()) { + for each (var isvc :InvocationService in _bstrap.services) { if (isvc is clazz) { return isvc; } diff --git a/src/as/com/threerings/presents/net/BootstrapData.as b/src/as/com/threerings/presents/net/BootstrapData.as index 38d951ecb..cdcce6c86 100644 --- a/src/as/com/threerings/presents/net/BootstrapData.as +++ b/src/as/com/threerings/presents/net/BootstrapData.as @@ -26,12 +26,10 @@ import com.threerings.io.ObjectOutputStream; import com.threerings.io.Streamable; import com.threerings.util.Log; -import com.threerings.util.StreamableArrayList; /** - * A BoostrapData object is communicated back to the client - * after authentication has succeeded and after the server is fully - * prepared to deal with the client. It contains information the client + * A BoostrapData object is communicated back to the client after authentication has succeeded and + * after the server is fully prepared to deal with the client. It contains information the client * will need to interact with the server. */ public class BootstrapData @@ -44,13 +42,12 @@ public class BootstrapData public var clientOid :int; /** A list of handles to invocation services. */ - public var services :StreamableArrayList; + public var services :Array; // documentation inherited from interface Streamable public function writeObject (out :ObjectOutputStream) :void { - Log.getLog(this).warning( - "This is client code: BootstrapData shouldn't be written"); + Log.getLog(this).warning("This is client code: BootstrapData shouldn't be written"); } // documentation inherited from interface Streamable @@ -58,7 +55,7 @@ public class BootstrapData { connectionId = ins.readInt(); clientOid = ins.readInt(); - services = (ins.readObject() as StreamableArrayList); + services = (ins.readObject() as Array); } } }