X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.json%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fserver%2Fjson%2FGenericJsonDeserializer.java;h=5c865af961b845b5662efa05c68b75fd1130cbc5;hb=e38c8ad82cb57e56ab246b1d65f440653bed78f8;hp=6bfe9b698431a58694880bd627ee886896dd8cab;hpb=b00a7e9898ea2819100290cab22bf614e23a3abf;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/GenericJsonDeserializer.java b/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/GenericJsonDeserializer.java
index 6bfe9b698..5c865af96 100644
--- a/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/GenericJsonDeserializer.java
+++ b/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/GenericJsonDeserializer.java
@@ -7,7 +7,7 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.server.ArgeoServerException;
+import org.argeo.ArgeoException;
 import org.codehaus.jackson.JsonFactory;
 import org.codehaus.jackson.JsonGenerator;
 import org.codehaus.jackson.JsonNode;
@@ -24,6 +24,7 @@ public class GenericJsonDeserializer<T> extends JsonDeserializer<T> {
 
 	private JsonFactory jsonFactory = new JsonFactory();
 	private ObjectCodec objectCodec = new ObjectMapper();
+	private JsonObjectFactory defaultObjectFactory = new JsonObjectFactoryImpl();
 
 	private String typeField = "type";
 
@@ -57,10 +58,13 @@ public class GenericJsonDeserializer<T> extends JsonDeserializer<T> {
 		}
 
 		if (objectFactory == null)
-			throw new ArgeoServerException(
+			objectFactory = defaultObjectFactory;
+
+		if (objectFactory == null || !objectFactory.supports(type))
+			throw new ArgeoException(
 					"Cannot find JSON object factory for type " + type);
 
-		return (T)objectFactory.readValue(type, str);
+		return (T) objectFactory.readValue(type, str);
 	}
 
 	public void setTypeField(String typeField) {