Prepare for 2.4.1.1, to only include #491
diff --git a/pom.xml b/pom.xml
index 963edd3..7eb70d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.4.2-SNAPSHOT</version>
+ <version>2.4.1.1-SNAPSHOT</version>
<name>jackson-databind</name>
<packaging>bundle</packaging>
<description>General data-binding functionality for Jackson: works on core streaming API</description>
diff --git a/release-notes/VERSION b/release-notes/VERSION
index 38c039a..cd18977 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -1,5 +1,16 @@
Project: jackson-databind
-Version: 2.4.1 (17-Jun-2014)
+Version: 2.4.1.1 (18-Jun-2014)
+
+Special one-off "micro patc" for:
+
+#491: Temporary work-around for issue #490 (full fix for 2.5 needs to be
+ in `jackson-annotations`)
+
+------------------------------------------------------------------------
+=== History: ===
+------------------------------------------------------------------------
+
+2.4.1 (17-Jun-2014)
#479: NPE on trying to deserialize a `String[]` that contains null
(reported by huxi@github)
@@ -8,10 +19,6 @@
#489 (partial): TypeFactory cache prevents garbage collection of custom ClassLoader
(reported by sftwrengnr@github)
-------------------------------------------------------------------------
-=== History: ===
-------------------------------------------------------------------------
-
2.4.0 (02-Jun-2014)
#81: Allow use of @JsonUnwrapped with typed (@JsonTypeInfo) classes, provided
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/DefaultDeserializationContext.java b/src/main/java/com/fasterxml/jackson/databind/deser/DefaultDeserializationContext.java
index b87af4d..ea809aa 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/DefaultDeserializationContext.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/DefaultDeserializationContext.java
@@ -91,8 +91,10 @@
if (resolver == null) {
resolver = resolverType.newForDeserialization(this);
- // Temporary fix for 490 until 4.2
- if(resolverType instanceof SimpleObjectIdResolver) {
+ /* !!! 18-Jun-2014, pgelinas: Temporary fix for [#490] until real
+ * fix (for jackson-annotations, SimpleObjectIdResolver) can be added.
+ */
+ if (resolverType instanceof SimpleObjectIdResolver) {
resolver = new SimpleObjectIdResolver();
}
_objectIdResolvers.add(resolver);