From d0bc9da2b5daa7d110707271664ad3e3fec2a760 Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <andrzej@threerings.net>
Date: Wed, 30 Mar 2011 00:38:27 +0000
Subject: [PATCH] Calling createObject requires initialization, else we get an
 NPE.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6557 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 src/main/java/com/threerings/io/Streamer.java | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/main/java/com/threerings/io/Streamer.java b/src/main/java/com/threerings/io/Streamer.java
index e1c53641e..b3ac64221 100644
--- a/src/main/java/com/threerings/io/Streamer.java
+++ b/src/main/java/com/threerings/io/Streamer.java
@@ -536,6 +536,17 @@ public abstract class Streamer
             _writer = writer;
         }
 
+        @Override
+        public Object createObject (ObjectInputStream in)
+            throws IOException, ClassNotFoundException
+        {
+            // we need to initialize in order to access the constructor
+            if (_marshallers == null) {
+                initMarshallers();
+            }
+            return super.createObject(in);
+        }
+
         @Override
         public void writeObject (Object object, ObjectOutputStream out, boolean useWriter)
             throws IOException