Merge pull request #320 from zhengzepeng/master

if map is pojo, write class name first

map.go

@@ -122,9 +122,16 @@ func (e *Encoder) encMap(m interface{}) error {
 		return nil
 	}
 
+	// if pojo, write class name first
+	if p, ok := m.(POJO); ok {
+		e.buffer = encByte(e.buffer, BC_MAP)
+		e.buffer = encString(e.buffer, p.JavaClassName())
+	} else {
+		e.buffer = encByte(e.buffer, BC_MAP_UNTYPED)
+	}
+
 	keys = value.MapKeys()
 
-	e.buffer = encByte(e.buffer, BC_MAP_UNTYPED)
 	if len(keys) > 0 {
 		typ = value.Type().Key()
 		for i := 0; i < len(keys); i++ {

map_test.go

@@ -170,3 +170,15 @@ func TestCustomMap(t *testing.T) {
 
 	testDecodeFramework(t, "customReplyListMapListMap", listMapListMap)
 }
+
+type CustomMap map[string]interface{}
+
+func (dict *CustomMap) JavaClassName() string {
+	return "test.model.CustomMap"
+}
+
+func TestJavaMap(t *testing.T) {
+	customMap := &CustomMap{"Name": "Test"}
+	RegisterPOJO(customMap)
+	testJavaDecode(t, "customArgTypedFixed_CustomMap", customMap)
+}

test_hessian/src/main/java/test/TestCustomDecode.java

@@ -20,11 +20,13 @@
 import com.caucho.hessian.io.Hessian2Input;
 import com.caucho.hessian.test.A0;
 import com.caucho.hessian.test.A1;
+
 import java.io.InputStream;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.*;
 
+import test.model.CustomMap;
 import test.model.DateDemo;
 
 
@@ -214,4 +216,11 @@ public Object customArgTypedFixedList_HashSet() throws Exception {
         HashSet o = (HashSet) input.readObject();
         return o.contains(0) && o.contains(1);
     }
+
+    public Object customArgTypedFixed_CustomMap() throws Exception {
+        CustomMap o = (CustomMap) input.readObject();
+        String value = (String) o.get("Name");
+        return "Test".equals(value);
+    }
+
 }