Make sure the context is properly set.

Author: ghillairet

emfjson-jackson/src/main/java/org/emfjson/jackson/databind/deser/EObjectDeserializer.java

@@ -54,6 +54,8 @@ public boolean isCachable() {
 
 	@Override
 	public EObject deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
+		prepareContext(ctxt, null);
+
 		return doDeserialize(jp, findRoot(ctxt), ctxt);
 	}
 
@@ -286,6 +288,11 @@ public Class<?> handledType() {
 
 	@Override
 	public JsonDeserializer<?> createContextual(DeserializationContext ctxt, BeanProperty property) throws JsonMappingException {
+		prepareContext(ctxt, property);
+		return this;
+	}
+
+	protected void prepareContext(DeserializationContext ctxt, BeanProperty property) {
 		ReferenceEntries entries = (ReferenceEntries) ctxt.getAttribute("entries");
 		Resource resource = (Resource) ctxt.getAttribute("resource");
 
@@ -309,8 +316,6 @@ public JsonDeserializer<?> createContextual(DeserializationContext ctxt, BeanPro
 		ctxt.setAttribute("cache", cache);
 		ctxt.setAttribute("resourceSet", resourceSet);
 		ctxt.setAttribute("options", options);
-
-		return this;
 	}
 
 }