Upload of distributions

[gpl/argeo-slc.git] / runtime / org.argeo.slc.server / src / main / java / org / argeo / slc / web / mvc / event / PollEventController.java

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/event/PollEventController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/event/PollEventController.java
index 0ebb2f6469b202a53ee87f29b585adc0840304e0..856af5ce4a4b0d6ba102891a769bab63c62e55dc 100644 (file)
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/event/PollEventController.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/event/PollEventController.java
@@ -14,7 +14,8 @@ import org.springframework.web.servlet.ModelAndView;
 public class PollEventController extends AbstractServiceController {
        private final static Log log = LogFactory.getLog(PollEventController.class);
 
-       private SlcEventListener eventListener;
+       private SlcEventListener eventListener = null;
+
        private SlcEventListenerRegister eventListenerRegister;
        private Long defaultTimeout = 10000l;
 
@@ -30,7 +31,8 @@ public class PollEventController extends AbstractServiceController {
                else
                        timeout = defaultTimeout;
 
-               SlcEvent event = eventListener.listen(eventListenerRegister, timeout);
+               SlcEvent event = eventListener.listen(eventListenerRegister.getId(),
+                               eventListenerRegister.getDescriptorsCopy(), timeout);
                if (event != null) {
                        modelAndView.addObject("event", event);
 
@@ -40,10 +42,6 @@ public class PollEventController extends AbstractServiceController {
                }
        }
 
-       public void setEventListener(SlcEventListener slcEventListener) {
-               this.eventListener = slcEventListener;
-       }
-
        public void setEventListenerRegister(
                        SlcEventListenerRegister eventListenerRegister) {
                this.eventListenerRegister = eventListenerRegister;
@@ -53,4 +51,8 @@ public class PollEventController extends AbstractServiceController {
                this.defaultTimeout = defaultTimeout;
        }
 
+       public void setEventListener(SlcEventListener eventListener) {
+               this.eventListener = eventListener;
+       }
+
 }