diff options
| author | Muga Nishizawa <muga@f11vm.(none)> | 2010-09-27 17:56:19 +0900 |
|---|---|---|
| committer | Muga Nishizawa <muga@f11vm.(none)> | 2010-09-27 17:56:19 +0900 |
| commit | 29e99e229b2bf31732b7d9713d8da990c5aee82c (patch) | |
| tree | e1f90f988816ee0df3ba6da4acc7fce1bc5c206c /java/src | |
| parent | 2736b88dd569cc0e11c9ea18a917ba4dfc1a095e (diff) | |
| parent | e739c60e9f37c9d9903df7f11c866e15f2c12404 (diff) | |
| download | msgpack-python-29e99e229b2bf31732b7d9713d8da990c5aee82c.tar.gz | |
Merge branch 'master' of git@github.com:msgpack/msgpack
Diffstat (limited to 'java/src')
4 files changed, 9 insertions, 4 deletions
diff --git a/java/src/main/java/org/msgpack/MessagePackObject.java b/java/src/main/java/org/msgpack/MessagePackObject.java index f7e9e0e..8dd9d8b 100644 --- a/java/src/main/java/org/msgpack/MessagePackObject.java +++ b/java/src/main/java/org/msgpack/MessagePackObject.java @@ -23,6 +23,10 @@ import java.util.Map; import java.math.BigInteger; public abstract class MessagePackObject implements Cloneable, MessagePackable { + static { + Templates.load(); + } + public boolean isNil() { return false; } diff --git a/java/src/main/java/org/msgpack/Templates.java b/java/src/main/java/org/msgpack/Templates.java index 222f625..b693840 100644 --- a/java/src/main/java/org/msgpack/Templates.java +++ b/java/src/main/java/org/msgpack/Templates.java @@ -20,6 +20,8 @@ package org.msgpack; import org.msgpack.template.*; public class Templates { + public static void load() { } + public static Template tList(Template elementTemplate) { return new ListTemplate(elementTemplate); } diff --git a/java/src/main/java/org/msgpack/Unpacker.java b/java/src/main/java/org/msgpack/Unpacker.java index add3312..33c7d4c 100644 --- a/java/src/main/java/org/msgpack/Unpacker.java +++ b/java/src/main/java/org/msgpack/Unpacker.java @@ -108,6 +108,9 @@ import org.msgpack.annotation.MessagePackOrdinalEnum; * </pre> */ public class Unpacker implements Iterable<MessagePackObject> { + static { + Templates.load(); + } // buffer: // +---------------------------------------------+ diff --git a/java/src/test/java/org/msgpack/TestReflectionPackerTemplate.java b/java/src/test/java/org/msgpack/TestReflectionPackerTemplate.java index 27edde1..1f0016d 100644 --- a/java/src/test/java/org/msgpack/TestReflectionPackerTemplate.java +++ b/java/src/test/java/org/msgpack/TestReflectionPackerTemplate.java @@ -18,8 +18,6 @@ public class TestReflectionPackerTemplate { @Test public void testPackConvert() throws Exception { - tString(); // FIXME link StringTemplate - ByteArrayOutputStream out = new ByteArrayOutputStream(); MessagePacker packer = ReflectionPacker.create(StringFieldClass.class); @@ -45,8 +43,6 @@ public class TestReflectionPackerTemplate { @Test public void testPackConvert02() throws Exception { - tString(); // FIXME link StringTemplate - ByteArrayOutputStream out = new ByteArrayOutputStream(); CustomPacker.register(StringFieldClass.class, ReflectionPacker.create(StringFieldClass.class)); |