Fix #23 for 2.6.4

Author: cowtowncoder

release-notes/VERSION

@@ -4,6 +4,11 @@ Project: jackson-dataformat-avro
 = Releases
 ------------------------------------------------------------------------
 
+2.6.4 (not yet released)
+
+#23: MapWriteContext.createChildObjectContext() should call _schema.getValueType()
+ (reported by shoeree@github, cresny@github)
+
 2.6.3 (12-Oct-2015)
 2.6.2 (15-Sep-2015)
 2.6.1 (09-Aug-2015)

src/main/java/com/fasterxml/jackson/dataformat/avro/ser/MapWriteContext.java

@@ -46,7 +46,7 @@ public final AvroWriteContext createChildArrayContext() {
     public final AvroWriteContext createChildObjectContext() throws JsonMappingException
     {
         _verifyValueWrite();
-        AvroWriteContext child = _createObjectContext(_schema.getElementType());
+        AvroWriteContext child = _createObjectContext(_schema.getValueType());
         _data.put(_currentName, child.rawValue());
         return child;
     }

src/test/java/com/fasterxml/jackson/dataformat/avro/NestedMapTest.java

@@ -0,0 +1,48 @@
+package com.fasterxml.jackson.dataformat.avro;
+
+import java.io.IOException;
+import java.util.Map;
+
+import org.apache.avro.Schema;
+import org.junit.Test;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import com.fasterxml.jackson.dataformat.avro.AvroMapper;
+import com.fasterxml.jackson.dataformat.avro.AvroSchema;
+import com.fasterxml.jackson.dataformat.avro.schema.AvroSchemaGenerator;
+
+public class NestedMapTest extends AvroTestBase
+{
+	public static class Nester {
+		@JsonProperty
+		public Map<String,Map<String,Integer>> nested;
+	}
+
+	public void testSerialization() throws IOException
+	{
+		Nester fromJson = new ObjectMapper().readValue(
+				"{\"nested\": {\"map\":{\"value\":1}}}"
+				, Nester.class);
+		
+		AvroMapper mapper = new AvroMapper();
+		//Generate schema from class
+		AvroSchemaGenerator gen = new AvroSchemaGenerator();
+		mapper.acceptJsonFormatVisitor(Nester.class, gen);
+		Schema schema = gen.getGeneratedSchema().getAvroSchema(); 
+
+		//Serialize
+		byte[] avroData =  mapper.writer(new AvroSchema(schema))
+				.writeValueAsBytes(fromJson);
+
+		//Deserialize
+		Nester nester = mapper.readerFor(Nester.class)
+				   .with(new AvroSchema(schema))
+				   .readValue(avroData);
+		int val = nester.nested.get("map").get("value");
+		assertEquals(1, val);
+		
+	}
+}