From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 13 Oct 2009 17:25:55 +0000 (+0000)
Subject: Introduce argeo server hibernate
X-Git-Tag: argeo-commons-2.1.30~1745
X-Git-Url: http://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=a52d8b41e4f2f39ccc51b0c1cfa99143fb2972a8

Introduce argeo server hibernate

git-svn-id: https://svn.argeo.org/commons/trunk@3024 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/server/runtime/org.argeo.server.hibernate/src/main/java/org/argeo/server/hibernate/LightDaoInterceptor.java b/server/runtime/org.argeo.server.hibernate/src/main/java/org/argeo/server/hibernate/LightDaoInterceptor.java
index 9f3ba093d..3bb13f37d 100644
--- a/server/runtime/org.argeo.server.hibernate/src/main/java/org/argeo/server/hibernate/LightDaoInterceptor.java
+++ b/server/runtime/org.argeo.server.hibernate/src/main/java/org/argeo/server/hibernate/LightDaoInterceptor.java
@@ -35,15 +35,24 @@ public class LightDaoInterceptor extends EmptyInterceptor {
 	@Override
 	public Object getEntity(String entityName, Serializable id) {
 		Class<?> clss = findSupportingClass(entityName);
+		Object res = null;
 		if (clss != null) {
-			if (businessIdFields.containsKey(clss))
-				return lightDaoSupport.getByField(clss, businessIdFields
-						.get(clss), bidMappings.get(clss).get(id));
-			else
-				return lightDaoSupport.getByKey(clss, id);
+			if (businessIdFields.containsKey(clss)) {
+				String field = businessIdFields.get(clss);
+				Object value = bidMappings.get(clss).get(id);
+				res = lightDaoSupport.getByField(clss, field, value);
+				if (log.isDebugEnabled())
+					log.debug("Got entity " + clss + " (" + field + "=" + value
+							+ ")");
+			} else {
+				res = lightDaoSupport.getByKey(clss, id);
+				if (log.isDebugEnabled())
+					log.debug("Got entity " + clss + " (id=" + id + ")");
+			}
 		} else {
-			return super.getEntity(entityName, id);
+			res = super.getEntity(entityName, id);
 		}
+		return res;
 	}
 
 	@Override