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=236a3b858804743db63addcbc20cb0cfcbbcf3cc;hb=c132d006584df1c992028e4a3e69c0a1293a0cc2;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..236a3b858 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
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.argeo.server.dao;
 
 import java.beans.PropertyEditor;
@@ -12,12 +28,11 @@ 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;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.generic.GenericBeanFactoryAccessor;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.io.Resource;
@@ -64,7 +79,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 +129,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);
 	}
 
@@ -143,8 +160,7 @@ public abstract class AbstractMemoryDaoSupport implements LightDaoSupport,
 			res.addAll((Collection<T>) model.get(classToUse).values());
 
 		if (applicationContext != null)
-			res.addAll(new GenericBeanFactoryAccessor(applicationContext)
-					.getBeansOfType(clss).values());
+			res.addAll(applicationContext.getBeansOfType(clss).values());
 
 		return res;
 	}