From 4e8c8bce3c3e4f8c11d389676a721493a622849e Mon Sep 17 00:00:00 2001 From: Charlie Groves Date: Sun, 8 Aug 2010 22:19:17 +0000 Subject: [PATCH] Comment fixes. Object[] is put in _marshallers as a wrapped BasicStreamer below, so don't act like we're handling it with the generic marshaller. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6104 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/io/BasicStreamers.java | 2 +- src/java/com/threerings/io/FieldMarshaller.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/java/com/threerings/io/BasicStreamers.java b/src/java/com/threerings/io/BasicStreamers.java index 0d3548810..d4937e780 100644 --- a/src/java/com/threerings/io/BasicStreamers.java +++ b/src/java/com/threerings/io/BasicStreamers.java @@ -83,7 +83,7 @@ public class BasicStreamers new DoubleArrayStreamer(), new ObjectArrayStreamer(), new ListStreamer(), - new ListStreamer(), + new ListStreamer(),// Second ListStreamer lines up with ArrayList above }; /** Streams {@link Boolean} instances. */ diff --git a/src/java/com/threerings/io/FieldMarshaller.java b/src/java/com/threerings/io/FieldMarshaller.java index 37cb04a2e..708b7daf5 100644 --- a/src/java/com/threerings/io/FieldMarshaller.java +++ b/src/java/com/threerings/io/FieldMarshaller.java @@ -241,11 +241,10 @@ public abstract class FieldMarshaller }; _marshallers.put(Streamable.class, gmarsh); - // use the same generic marshaller for fields declared to by type Object or Object[] with - // the expectation that they will contain only primitive types or Streamables; the runtime - // will fail informatively if we attempt to store non-Streamable objects in that field + // use the same generic marshaller for fields declared as Object with the expectation that + // they will contain only primitive types or Streamables; the runtime will fail + // informatively if we attempt to store non-Streamable objects in that field _marshallers.put(Object.class, gmarsh); - _marshallers.put(Object[].class, gmarsh); // create marshallers for the primitive types _marshallers.put(Boolean.TYPE, new FieldMarshaller() {