X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fserver%2Fdao%2FAbstractMemoryDaoSupport.java;h=d18514a278fe155842877af874d32c131d4f0d2b;hb=3a9e434fc0f80eab9568b1e5b8bb90f9fcc4310e;hp=9e0881bf0243e4a8479172f7dc6f134576f74cf2;hpb=f99d677ed0ff66bf89b2662439802a240ee2e884;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/dao/AbstractMemoryDaoSupport.java b/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/dao/AbstractMemoryDaoSupport.java
index 9e0881bf0..d18514a27 100644
--- a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/dao/AbstractMemoryDaoSupport.java
+++ b/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/dao/AbstractMemoryDaoSupport.java
@@ -12,7 +12,7 @@ import java.util.TreeMap;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.server.ArgeoServerException;
+import org.argeo.ArgeoException;
 import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.beans.BeansException;
@@ -64,7 +64,7 @@ public abstract class AbstractMemoryDaoSupport implements LightDaoSupport,
 				in = res.getInputStream();
 				load(in, references);
 			} catch (Exception e) {
-				throw new ArgeoServerException("Cannot load stream", e);
+				throw new ArgeoException("Cannot load stream", e);
 			} finally {
 				IOUtils.closeQuietly(in);
 			}
@@ -114,6 +114,8 @@ public abstract class AbstractMemoryDaoSupport implements LightDaoSupport,
 
 	@SuppressWarnings("unchecked")
 	public <T> T getByKey(Class<T> clss, Object key) {
+		if (key == null)
+			throw new ArgeoException("Key is null for " + clss);
 		return (T) model.get(findClass(clss)).get(key);
 	}