Merge branch 'master' of git://github.com/msgpack/msgpack-java

takeshita · takeshita · commit 11601d469773 · 2011-10-18T16:19:04.000+09:00
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -6,8 +6,10 @@ Release 0.6.2 -
     MSGPACK-42 VerifyError occurs when generating templates for classes that have 
     @Optional primitive fields
     MSGPACK-43 Mutually referencing MessagePack objects causes StackOverflowError
+    MSGPACK-49 Fail to pack org.msgpack.type.Value classes
 
   IMPROVEMENTS
+    Modifies TemplateRegistry class for msgpack-scala
     Adds deleteTemplateClass method to TemplatePrecompiler.
 
 Release 0.6.1 - 2011/10/07
diff --git a/src/main/java/org/msgpack/template/TemplateRegistry.java b/src/main/java/org/msgpack/template/TemplateRegistry.java
@@ -298,6 +298,7 @@ private <T> Template<T> lookupAfterBuilding(Class<T> targetClass) {
 	TemplateBuilder builder = chain.select(targetClass, true);
 	Template<T> tmpl = null;
 	if (builder != null) {
+	    // TODO #MN for Android, we should modify here
 	    tmpl = chain.getForceBuilder().loadTemplate(targetClass);
 	    if (tmpl != null) {
 		register(targetClass, tmpl);
diff --git a/src/main/java/org/msgpack/template/builder/TemplateBuilderChain.java b/src/main/java/org/msgpack/template/builder/TemplateBuilderChain.java
@@ -71,7 +71,6 @@ protected void reset(final TemplateRegistry registry, final ClassLoader cl) {
 	} else { // use reflection
 	    builder = new ReflectionTemplateBuilder(registry);
 	    templateBuilders.add(builder);
-	    templateBuilders.add(new OrdinalEnumTemplateBuilder(registry));
 	    templateBuilders.add(new ReflectionBeansTemplateBuilder(registry));
 	}
     }
diff --git a/src/test/java/org/msgpack/TestMessagePack01.java b/src/test/java/org/msgpack/TestMessagePack01.java
@@ -709,15 +709,11 @@ public <K, V> void testMap(Map<K, V> v, Class<K> keyElementClass, Class<V> value
      */
     @Test
     public void testValuePassedAsObject() throws IOException {
-
-	    MessagePack msgpack = new MessagePack();
+	MessagePack msgpack = new MessagePack();
         String text = "This class is Value but...";
         Object value = ValueFactory.createRawValue("This class is Value but...");
 
         byte[] strValue = msgpack.write(value);
-        for(byte b : strValue){
-          System.out.print(String.format("%02x ", b));
-        }
         // should be raw type
         assertEquals(0xa0 + text.length(),0xff & strValue[0]);
     }

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,6 @@ protected void reset(final TemplateRegistry registry, final ClassLoader cl) {`
`71`	`71`	`} else { // use reflection`
`72`	`72`	`builder = new ReflectionTemplateBuilder(registry);`
`73`	`73`	`templateBuilders.add(builder);`
`74`		`- templateBuilders.add(new OrdinalEnumTemplateBuilder(registry));`
`75`	`74`	`templateBuilders.add(new ReflectionBeansTemplateBuilder(registry));`
`76`	`75`	`}`
`77`	`76`	`}`