From 65dee239c7ffd70a06ad962350e41fccfaae4d07 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Mon, 20 Jan 2014 14:20:10 -0800 Subject: [PATCH] Can't @Override on iface method if we're 1.5 compat. --- .../main/java/com/threerings/admin/server/ConfigRegistry.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/com/threerings/admin/server/ConfigRegistry.java b/core/src/main/java/com/threerings/admin/server/ConfigRegistry.java index 611b5e131..fa5dab386 100644 --- a/core/src/main/java/com/threerings/admin/server/ConfigRegistry.java +++ b/core/src/main/java/com/threerings/admin/server/ConfigRegistry.java @@ -396,7 +396,7 @@ public abstract class ConfigRegistry } protected static class DefaultSerializer implements Serializer { - @Override public String serialize (String name, Object value) throws Exception { + public String serialize (String name, Object value) throws Exception { ByteArrayOutputStream out = new ByteArrayOutputStream(); ObjectOutputStream oout = createObjectOutputStream(out); oout.writeObject(value); @@ -404,7 +404,7 @@ public abstract class ConfigRegistry return StringUtil.hexlate(out.toByteArray()); } - @Override public Object deserialize (String value) throws Exception { + public Object deserialize (String value) throws Exception { ByteArrayInputStream bin = new ByteArrayInputStream(StringUtil.unhexlate(value)); ObjectInputStream oin = createObjectInputStream(bin); return oin.readObject();