Merge pull request #491 from pgelinas/master

Temporary fixed issue #490

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/deser/DefaultDeserializationContext.java

@@ -88,8 +88,13 @@ public ReadableObjectId findObjectId(Object id, ObjectIdGenerator<?> gen, Object
                 }
             }
         }
+
         if (resolver == null) {
             resolver = resolverType.newForDeserialization(this);
+            // Temporary fix for 490 until 4.2
+            if(resolverType instanceof SimpleObjectIdResolver) {
+               resolver = new SimpleObjectIdResolver();
+            }
             _objectIdResolvers.add(resolver);
         }