From e275c2cedaf5afd49ba09382f4879c6f8a0245e1 Mon Sep 17 00:00:00 2001 From: "Ray J. Greenwell" Date: Wed, 21 Jan 2015 10:26:52 -0800 Subject: [PATCH] Added commented-out Java 6 improvements. --- core/src/main/java/com/threerings/io/ObjectInputStream.java | 1 + core/src/main/java/com/threerings/io/ObjectOutputStream.java | 1 + 2 files changed, 2 insertions(+) diff --git a/core/src/main/java/com/threerings/io/ObjectInputStream.java b/core/src/main/java/com/threerings/io/ObjectInputStream.java index 1f3fdbac8..7bb4ff241 100644 --- a/core/src/main/java/com/threerings/io/ObjectInputStream.java +++ b/core/src/main/java/com/threerings/io/ObjectInputStream.java @@ -318,6 +318,7 @@ public class ObjectInputStream extends DataInputStream byte[] bbuf = new byte[utflen]; in.read(bbuf); return new String(bbuf, "UTF-8"); + //return new String(bbuf, Charsets.UTF_8); // TODO Java 6 (Charsets is from guava) } @Override diff --git a/core/src/main/java/com/threerings/io/ObjectOutputStream.java b/core/src/main/java/com/threerings/io/ObjectOutputStream.java index 993e515c8..dc7b84811 100644 --- a/core/src/main/java/com/threerings/io/ObjectOutputStream.java +++ b/core/src/main/java/com/threerings/io/ObjectOutputStream.java @@ -304,6 +304,7 @@ public class ObjectOutputStream extends DataOutputStream public void writeUnmodifiedUTF (String str) throws IOException { + // byte[] bytes = str.getBytes(Charsets.UTF_8); // TODO Java 6 (Charsets is from guava) byte[] bytes = str.getBytes("UTF-8"); writeShort(bytes.length); write(bytes);