X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.server%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fweb%2Fmvc%2Fcontrollers%2FEventController.java;h=8e997f6f254869fe8b9c124c3222b76e5f212564;hb=e6e892ed3c2351212e16f2f404511ff5a8ce3c98;hp=b995a207d890df27eb7d00ac9d5a413efcf21047;hpb=856754d1c9381f2734f3583aba037efbbaaeab1d;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/controllers/EventController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/controllers/EventController.java
index b995a207d..8e997f6f2 100644
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/controllers/EventController.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/controllers/EventController.java
@@ -35,8 +35,9 @@ public class EventController {
 	private Long defaultTimeout = 10000l;
 
 	// IoC
-	private SlcEventListenerRegister eventListenerRegister;
 	private SlcEventListener eventListener = null;
+	// the following bean as a Session scope.
+	private SlcEventListenerRegister eventListenerRegister;
 
 	// Business Methods
 	@RequestMapping("/addEventListener.service")
@@ -47,10 +48,13 @@ public class EventController {
 		eventListenerRegister
 				.addEventListenerDescriptor(new SlcEventListenerDescriptor(
 						eventType, eventFilter));
-		if (log.isTraceEnabled())
+		if (log.isTraceEnabled()) {
 			log.trace("Registered listener on register "
 					+ eventListenerRegister.getId() + " for type " + eventType
 					+ ", filter=" + eventFilter);
+			log.trace("Nb of registered descriptors : "
+					+ eventListenerRegister.getDescriptorsCopy().size());
+		}
 		return ExecutionAnswer.ok("Execution completed properly");
 
 	}
@@ -63,10 +67,13 @@ public class EventController {
 		eventListenerRegister
 				.removeEventListenerDescriptor(new SlcEventListenerDescriptor(
 						eventType, eventFilter));
-		if (log.isTraceEnabled())
+		if (log.isTraceEnabled()) {
 			log.trace("Removed listener from register "
 					+ eventListenerRegister.getId() + " for type " + eventType
 					+ ", filter=" + eventFilter);
+			log.trace("Nb of registered descriptors : "
+					+ eventListenerRegister.getDescriptorsCopy().size());
+		}
 		return ExecutionAnswer.ok("Execution completed properly");
 	}
 
@@ -78,14 +85,23 @@ public class EventController {
 			timeout = Long.parseLong(timeoutStr);
 		else
 			timeout = defaultTimeout;
-
+		if (log.isTraceEnabled()) {
+			log.trace("Begin poolEvent.service :"
+					+ " Nb of registered descriptors : "
+					+ eventListenerRegister.getDescriptorsCopy().size());
+		}
 		SlcEvent event = eventListener.listen(eventListenerRegister.getId(),
 				eventListenerRegister.getDescriptorsCopy(), timeout);
 		if (event != null) {
+			if (log.isTraceEnabled())
+				log.trace("Event heard : " + event.toString());
 			return event;
 		} else {
+			if (log.isTraceEnabled())
+				log.trace("No Event heard - Time out: ");
 			return ExecutionAnswer.ok("Execution completed properly");
 		}
+
 	}
 
 	public void setEventListenerRegister(