Merge branch '2.10' into 2.11

Author: cowtowncoder

…/dataformat/xml/deser/XsiNil354Test.java …ataformat/xml/deser/XsiNilBasicTest.javasrc/test/java/com/fasterxml/jackson/dataformat/xml/deser/XsiNil354Test.java renamed to src/test/java/com/fasterxml/jackson/dataformat/xml/deser/XsiNilBasicTest.java src/test/java/com/fasterxml/jackson/dataformat/xml/deser/XsiNil354Test.java renamed to src/test/java/com/fasterxml/jackson/dataformat/xml/deser/XsiNilBasicTest.java

@@ -3,10 +3,10 @@
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 import com.fasterxml.jackson.dataformat.xml.XmlTestBase;
 
-public class XsiNil354Test extends XmlTestBase
+public class XsiNilBasicTest extends XmlTestBase
 {
     private final static String XSI_NS_DECL = "xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'";
-    
+
     protected static class DoubleWrapper {
         public Double d;
 
@@ -16,6 +16,13 @@ public DoubleWrapper(Double value) {
         }
     }
 
+    protected static class DoubleWrapper2 {
+        public Double a = 100.0; // init to ensure it gets overwritten
+        public Double b = 200.0;
+
+        public DoubleWrapper2() { }
+    }
+
     private final XmlMapper MAPPER = newMapper();
 
     public void testWithDoubleAsNull() throws Exception
@@ -44,6 +51,40 @@ public void testWithDoubleAsNonNull() throws Exception
         assertEquals(Double.valueOf(0.25), bean.d);
     }
 
+    public void testWithDoubleAsMixed() throws Exception
+    {
+        DoubleWrapper2 bean = MAPPER.readValue(
+"<DoubleWrapper "+XSI_NS_DECL+">\n"
++"<a xsi:nil='true'></a>\n"
++"<b xsi:nil='false'>0.25</b>\n"
++"</DoubleWrapper>",
+            DoubleWrapper2.class);
+        assertNotNull(bean);
+        assertNull(bean.a);
+        assertEquals(Double.valueOf(0.25), bean.b);
+
+        bean = MAPPER.readValue(
+"<DoubleWrapper "+XSI_NS_DECL+">\n"
++"<a xsi:nil='false'>0.25</a>\n"
++"<b xsi:nil='true'></b>\n"
++"</DoubleWrapper>",
+            DoubleWrapper2.class);
+        assertNotNull(bean);
+        assertEquals(Double.valueOf(0.25), bean.a);
+        assertNull(bean.b);
+
+        // and last one just for ... funsies
+        DoubleWrapper2 defaultValue = new DoubleWrapper2();
+        bean = MAPPER.readValue(
+"<DoubleWrapper "+XSI_NS_DECL+">\n"
++"</DoubleWrapper>",
+            DoubleWrapper2.class);
+        assertNotNull(bean.a);
+        assertNotNull(bean.b);
+        assertEquals(defaultValue.a, bean.a);
+        assertEquals(defaultValue.b, bean.b);
+    }
+
     public void testRootPojoAsNull() throws Exception
     {
         Point bean = MAPPER.readValue(