X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.hibernate%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fserver%2Fhibernate%2FLightDaoInterceptor.java;h=d664b658814ca0849c2776d578f7329dfd60b8a2;hb=3bf0a93af9821078193b93fae8df980b7db4d844;hp=9f3ba093d1497af291a970e7d35320b930bb8a28;hpb=a5ecc57e5fdbb6af2064388be16813a2b4d8517d;p=lgpl%2Fargeo-commons.git

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..d664b6588 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.isTraceEnabled())
+					log.debug("Got entity " + clss + " (" + field + "=" + value
+							+ ")");
+			} else {
+				res = lightDaoSupport.getByKey(clss, id);
+				if (log.isTraceEnabled())
+					log.debug("Got entity " + clss + " (id=" + id + ")");
+			}
 		} else {
-			return super.getEntity(entityName, id);
+			res = super.getEntity(entityName, id);
 		}
+		return res;
 	}
 
 	@Override
@@ -66,7 +75,7 @@ public class LightDaoInterceptor extends EmptyInterceptor {
 				BeanWrapper bw = new BeanWrapperImpl(entity);
 				Object bid = bw.getPropertyValue(businessIdFields.get(clss));
 				bidMappings.get(clss).put(id, bid);
-				if (log.isDebugEnabled())
+				if (log.isTraceEnabled())
 					log.debug("Mapped tid " + id + " with bid " + bid + " for "
 							+ clss);
 			}