Merge branch '2.6' into 2.7

Conflicts:
	src/main/java/com/fasterxml/jackson/databind/DeserializationContext.java
	src/main/java/com/fasterxml/jackson/databind/ser/std/StdJdkSerializers.java

Author: cowtowncoder

release-notes/CREDITS

@@ -145,6 +145,8 @@ Benson Margulies:
    (2.4.4)
   * Contributed 944: Failure to use custom deserializer for key deserializer
    (2.6.3)
+  * Reported #1120: String value omitted from weirdStringException
+   (2.6.6)
 
 Steve Sanbeg: (sanbeg@github)
   * Contributed #482: Make date parsing error behavior consistent with JDK

release-notes/VERSION

@@ -95,6 +95,10 @@ INCOMPATIBILITIES:
  (reported by jefferyyuan@github)
 #1112: Detailed error message from custom key deserializer is discarded
  (contributed by Benson M)
+#1120: String value omitted from weirdStringException
+ (reported by Benson M)
+#1123: Serializing and Deserializing Locale.ROOT
+ (reported by hookumsnivy@github)
 
 2.6.5 (19-Jan-2016)
 

src/main/java/com/fasterxml/jackson/databind/DeserializationContext.java

@@ -936,7 +936,7 @@ public JsonMappingException weirdNumberException(Number value, Class<?> instClas
                         instClass.getName(), String.valueOf(value), msg),
                 value, instClass);
     }
-    
+
     /**
      * Helper method for constructing exception to indicate that given JSON
      * Object field name was not in format to be able to deserialize specified
@@ -1025,7 +1025,7 @@ protected String _calcName(Class<?> cls) {
         }
         return cls.getName();
     }
-    
+
     protected String _valueDesc() {
         try {
             return _desc(_parser.getText());

src/main/java/com/fasterxml/jackson/databind/deser/std/FromStringDeserializer.java

@@ -277,10 +277,14 @@ protected Object _deserialize(String value, DeserializationContext ctxt) throws
 
         @Override
         protected Object _deserializeFromEmptyString() throws IOException {
-            // As per [#398], URI requires special handling
+            // As per [databind#398], URI requires special handling
             if (_kind == STD_URI) {
                 return URI.create("");
             }
+            // As per [databind#1123], Locale too
+            if (_kind == STD_LOCALE) {
+                return Locale.ROOT;
+            }
             return super._deserializeFromEmptyString();
         }
     }

src/test/java/com/fasterxml/jackson/databind/deser/TestJdkTypes.java

@@ -32,7 +32,6 @@ static class PrimitivesBean
         public double doubleValue = -1.0;
     }
 
-    // for [JACKSON-616]
     static class WrappersBean
     {
         public Boolean booleanValue;
@@ -140,19 +139,17 @@ public void testCurrency() throws IOException
         assertEquals(usd, new ObjectMapper().readValue(quote("USD"), Currency.class));
     }
 
-    /**
-     * Test for [JACKSON-419]
-     */
     public void testLocale() throws IOException
     {
         assertEquals(new Locale("en"), MAPPER.readValue(quote("en"), Locale.class));
         assertEquals(new Locale("es", "ES"), MAPPER.readValue(quote("es_ES"), Locale.class));
-        assertEquals(new Locale("FI", "fi", "savo"), MAPPER.readValue(quote("fi_FI_savo"), Locale.class));
+        assertEquals(new Locale("FI", "fi", "savo"),
+                MAPPER.readValue(quote("fi_FI_savo"), Locale.class));
+        // [databind#1123]
+        Locale loc = MAPPER.readValue(quote(""), Locale.class);
+        assertSame(Locale.ROOT, loc);
     }
 
-    /**
-     * Test for [JACKSON-420] (add DeserializationConfig.FAIL_ON_NULL_FOR_PRIMITIVES)
-     */
     public void testNullForPrimitives() throws IOException
     {
         // by default, ok to rely on defaults

src/test/java/com/fasterxml/jackson/databind/ser/TestJdkTypes.java

@@ -20,12 +20,8 @@ public class TestJdkTypes
     extends com.fasterxml.jackson.databind.BaseMapTest
 {
     private final ObjectMapper MAPPER = objectMapper();
-    
-    /**
-     * Unit test to catch bug [JACKSON-8].
-     */
-    public void testBigDecimal()
-        throws Exception
+
+    public void testBigDecimal() throws Exception
     {
         Map<String, Object> map = new HashMap<String, Object>();
         String PI_STR = "3.14159265";
@@ -34,8 +30,7 @@ public void testBigDecimal()
         assertEquals("{\"pi\":3.14159265}", str);
     }
 
-    public void testBigDecimalAsPlainString()
-        throws Exception
+    public void testBigDecimalAsPlainString() throws Exception
     {
         final ObjectMapper mapper = new ObjectMapper();
 
@@ -46,10 +41,7 @@ public void testBigDecimalAsPlainString()
         String str = mapper.writeValueAsString(map);
         assertEquals("{\"pi\":3.00000000}", str);
     }
-    
-    /**
-     * Unit test related to [JACKSON-155]
-     */
+
     public void testFile() throws IOException
     {
         // this may get translated to different representation on Windows, maybe Mac:
@@ -81,9 +73,11 @@ public void testLocale() throws IOException
         assertEquals(quote("en"), MAPPER.writeValueAsString(new Locale("en")));
         assertEquals(quote("es_ES"), MAPPER.writeValueAsString(new Locale("es", "ES")));
         assertEquals(quote("fi_FI_savo"), MAPPER.writeValueAsString(new Locale("FI", "fi", "savo")));
+
+        // [databind#1123]
+        assertEquals(quote(""), MAPPER.writeValueAsString(Locale.ROOT));
     }
 
-    // [JACKSON-484]
     public void testInetAddress() throws IOException
     {
         assertEquals(quote("127.0.0.1"), MAPPER.writeValueAsString(InetAddress.getByName("127.0.0.1")));