Stabilize attachments and events

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

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/WebSlcEventListenerRegister.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/WebSlcEventListenerRegister.java
index 7cc6e8b9dcd89439ff68ceb6604eb41c7b7042d9..a3da141dd5781d26283feaa37e717e78b12e2679 100644 (file)
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/WebSlcEventListenerRegister.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/WebSlcEventListenerRegister.java
@@ -1,14 +1,12 @@
 package org.argeo.slc.web.mvc;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Vector;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.slc.SlcException;
-import org.argeo.slc.msg.event.SlcEvent;
-import org.argeo.slc.msg.event.SlcEventListener;
 import org.argeo.slc.msg.event.SlcEventListenerDescriptor;
 import org.argeo.slc.msg.event.SlcEventListenerRegister;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -21,9 +19,7 @@ public class WebSlcEventListenerRegister implements SlcEventListenerRegister,
 
        static final long serialVersionUID = 1l;
 
-       transient private SlcEventListener eventListener = null;
-
-       private String clientId = null;
+       //private String clientId = UUID.randomUUID().toString();
 
        /** Synchronized */
        private List<SlcEventListenerDescriptor> descriptors = new Vector<SlcEventListenerDescriptor>();
@@ -40,47 +36,41 @@ public class WebSlcEventListenerRegister implements SlcEventListenerRegister,
                descriptors.remove(eventListenerDescriptor);
        }
 
-       // public synchronized List<SlcEventListenerDescriptor> getDescriptorsCopy()
-       // {
-       // return new ArrayList<SlcEventListenerDescriptor>(descriptors);
-       // }
-
-       public SlcEvent listen(SlcEventListener eventListener, Long timeout) {
-               checkClientId();
-               this.eventListener = eventListener;
-               return this.eventListener.listen(clientId, descriptors, timeout);
-       }
-
-       public void init() {
-               clientId = getSessionId();
-               checkClientId();
-
-               if (log.isDebugEnabled())
-                       log.debug("Initialized web event listener " + clientId);
+       public synchronized List<SlcEventListenerDescriptor> getDescriptorsCopy() {
+               return new ArrayList<SlcEventListenerDescriptor>(descriptors);
        }
 
-       public void close() {
-               checkClientId();
-               if (eventListener != null)
-                       eventListener.close(clientId);
-
-               if (log.isDebugEnabled())
-                       log.debug("Closed web event listener " + clientId);
-       }
+       // public SlcEvent listen(SlcEventListener eventListener, Long timeout) {
+       // return eventListener.listen(clientId, getDescriptorsCopy(), timeout);
+       // }
 
-       protected void checkClientId() {
-               String sessionId = getSessionId();
-               if (clientId == null || !clientId.equals(sessionId))
-                       throw new SlcException("Client id " + clientId
-                                       + " not consistent with web session id " + sessionId);
-       }
+       // public void init() {
+       // clientId = getSessionId();
+       // checkClientId();
+       //
+       // if (log.isDebugEnabled())
+       // log.debug("Initialized web event listener " + clientId);
+       // }
+       //
+       // public void close() {
+       // checkClientId();
+       // if (log.isDebugEnabled())
+       // log.debug("Closed web event listener " + clientId);
+       // }
 
-       protected String getSessionId() {
+       // protected void checkClientId() {
+       // String sessionId = getSessionId();
+       // if (clientId == null || !clientId.equals(sessionId))
+       // throw new SlcException("Client id " + clientId
+       // + " not consistent with web session id " + sessionId);
+       // }
+       //
+       // protected String getSessionId() {
+       // return RequestContextHolder.currentRequestAttributes().getSessionId();
+       // }
+       //
+       public String getId() {
                return RequestContextHolder.currentRequestAttributes().getSessionId();
        }
 
-       public String getClientId() {
-               return clientId;
-       }
-
 }