Merge branch '2.12'

sp4ce · Jun 13, 2020 · 818c649 · 818c649
2 parents e1253d6 + 62c8ae6
commit 818c649
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/StdDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/StdDeserializer.java
@@ -1106,12 +1106,6 @@ protected Object _coerceIntegral(JsonParser p, DeserializationContext ctxt) thro
         return p.getNumberValue(); // should be optimal, whatever it is
     }
 
-    /*
-    /**********************************************************************
-    /* Helper methods for sub-classes, coercions, older (pre-2.12), deprecated
-    /**********************************************************************
-     */
-
     /**
      * Method to call when JSON `null` token is encountered. Note: only called when
      * this deserializer encounters it but NOT when reached via property
@@ -1179,6 +1173,12 @@ protected final void _verifyNullForPrimitiveCoercion(DeserializationContext ctxt
         _reportFailedNullCoerce(ctxt, enable, feat, strDesc);
     }
 
+    /*
+    /**********************************************************************
+    /* Helper methods for sub-classes, coercions, older (pre-2.12), deprecated
+    /**********************************************************************
+     */
+
     @Deprecated // since 2.12
     protected final void _verifyNullForScalarCoercion(DeserializationContext ctxt, String str) throws JsonMappingException
     {