From 85fec1b7587ea185cffaf892167bcda5a25fff88 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Fri, 19 Oct 2001 18:03:28 +0000 Subject: [PATCH] Coerce null strings into empty strings when marshalling. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@505 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../threerings/presents/io/StringArrayFieldMarshaller.java | 4 ++-- src/java/com/threerings/presents/io/ValueMarshaller.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/java/com/threerings/presents/io/StringArrayFieldMarshaller.java b/src/java/com/threerings/presents/io/StringArrayFieldMarshaller.java index aa71d59cf..3ed39d67f 100644 --- a/src/java/com/threerings/presents/io/StringArrayFieldMarshaller.java +++ b/src/java/com/threerings/presents/io/StringArrayFieldMarshaller.java @@ -1,5 +1,5 @@ // -// $Id: StringArrayFieldMarshaller.java,v 1.1 2001/10/17 02:48:11 mdb Exp $ +// $Id: StringArrayFieldMarshaller.java,v 1.2 2001/10/19 18:03:28 mdb Exp $ package com.threerings.presents.dobj.io; @@ -26,7 +26,7 @@ public class StringArrayFieldMarshaller implements FieldMarshaller } else { out.writeInt(value.length); for (int i = 0; i < value.length; i++) { - out.writeUTF(value[i]); + out.writeUTF((value[i] == null) ? "" : value[i]); } } } diff --git a/src/java/com/threerings/presents/io/ValueMarshaller.java b/src/java/com/threerings/presents/io/ValueMarshaller.java index 17390024a..aa2db1c99 100644 --- a/src/java/com/threerings/presents/io/ValueMarshaller.java +++ b/src/java/com/threerings/presents/io/ValueMarshaller.java @@ -1,5 +1,5 @@ // -// $Id: ValueMarshaller.java,v 1.5 2001/10/11 04:07:52 mdb Exp $ +// $Id: ValueMarshaller.java,v 1.6 2001/10/19 18:03:28 mdb Exp $ package com.threerings.presents.dobj.io; @@ -475,7 +475,7 @@ public class ValueMarshaller String[] data = (String[])value; out.writeInt(data.length); for (int i = 0; i < data.length; i++) { - out.writeUTF(data[i]); + out.writeUTF((data[i] == null) ? "" : data[i]); } }