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
This commit is contained in:
@@ -83,7 +83,7 @@ public class BasicStreamers
|
|||||||
new DoubleArrayStreamer(),
|
new DoubleArrayStreamer(),
|
||||||
new ObjectArrayStreamer(),
|
new ObjectArrayStreamer(),
|
||||||
new ListStreamer(),
|
new ListStreamer(),
|
||||||
new ListStreamer(),
|
new ListStreamer(),// Second ListStreamer lines up with ArrayList above
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Streams {@link Boolean} instances. */
|
/** Streams {@link Boolean} instances. */
|
||||||
|
|||||||
@@ -241,11 +241,10 @@ public abstract class FieldMarshaller
|
|||||||
};
|
};
|
||||||
_marshallers.put(Streamable.class, gmarsh);
|
_marshallers.put(Streamable.class, gmarsh);
|
||||||
|
|
||||||
// use the same generic marshaller for fields declared to by type Object or Object[] with
|
// use the same generic marshaller for fields declared as Object with the expectation that
|
||||||
// the expectation that they will contain only primitive types or Streamables; the runtime
|
// they will contain only primitive types or Streamables; the runtime will fail
|
||||||
// will fail informatively if we attempt to store non-Streamable objects in that field
|
// informatively if we attempt to store non-Streamable objects in that field
|
||||||
_marshallers.put(Object.class, gmarsh);
|
_marshallers.put(Object.class, gmarsh);
|
||||||
_marshallers.put(Object[].class, gmarsh);
|
|
||||||
|
|
||||||
// create marshallers for the primitive types
|
// create marshallers for the primitive types
|
||||||
_marshallers.put(Boolean.TYPE, new FieldMarshaller() {
|
_marshallers.put(Boolean.TYPE, new FieldMarshaller() {
|
||||||
|
|||||||
Reference in New Issue
Block a user