Update smalltalk.java

Author: m0ver

src/tinystruct/examples/smalltalk.java

@@ -62,6 +62,7 @@ public talk index() {
 
     List<String> session_ids;
     synchronized (this.meetings) {
+      final String sessionId = request.getSession().getId();
       if (this.meetings.get(meetingCode) == null) {
         this.meetings.put(meetingCode.toString(), new ConcurrentLinkedQueue<Builder>());
       }
@@ -72,8 +73,8 @@ public talk index() {
         this.sessions.put(meetingCode.toString(), session_ids = new ArrayList<String>());
       }
 
-      if(!session_ids.contains(request.getSession().getId()))
-      session_ids.add(request.getSession().getId());
+      if(!session_ids.contains(sessionId))
+      session_ids.add(sessionId);
 
       this.meetings.notifyAll();
     }
@@ -83,8 +84,8 @@ public talk index() {
       if(!this.list.containsKey(sessionId))
       {
         this.list.put(sessionId, new ConcurrentLinkedQueue<Builder>());
-        this.list.notifyAll();
       }
+      this.list.notifyAll();
     }
 
     this.setVariable("meeting_code", meetingCode.toString());
@@ -130,7 +131,8 @@ public String join(String meetingCode) throws ApplicationException {
   public String start(String name) throws ApplicationException {
     final HttpServletRequest request = (HttpServletRequest) this.context.getAttribute("HTTP_REQUEST");
     final HttpServletResponse response = (HttpServletResponse) this.context.getAttribute("HTTP_RESPONSE");
-
+    request.getSession().setAttribute("user", name);
+    
     Object meetingCode = request.getSession().getAttribute("meeting_code");
     if (meetingCode == null) {
       Reforward reforward = new Reforward(request, response);
@@ -139,7 +141,6 @@ public String start(String name) throws ApplicationException {
     } else {
       this.setVariable("meeting_code", meetingCode.toString());
     }
-    request.getSession().setAttribute("user", name);
 
     return name;
   }
@@ -197,15 +198,15 @@ public String update() throws ApplicationException, IOException {
     final HttpServletRequest request = (HttpServletRequest) this.context.getAttribute("HTTP_REQUEST");
     final Object meetingCode = request.getSession().getAttribute("meeting_code");
     final String sessionId = request.getSession().getId();
-    if ( meetingCode != null && sessions.get(meetingCode) != null && sessions.get(meetingCode).contains(sessionId)) {
-      return update(sessionId);
+    if (meetingCode != null) {
+      return this.update(meetingCode.toString(), sessionId);
     }
     return "";
   }
 
   public String update(String meetingCode, String sessionId) throws ApplicationException, IOException {
-    if ( meetingCode != null && sessions.get(meetingCode) != null && sessions.get(meetingCode).contains(sessionId)) {
-      return update(sessionId);
+    if (sessions.get(meetingCode) != null && sessions.get(meetingCode).contains(sessionId)) {
+      return this.update(sessionId);
     }
     return "";
   }
@@ -297,8 +298,8 @@ public void sessionCreated(HttpSessionEvent arg0) {
       if(!this.list.containsKey(sessionId))
       {
         this.list.put(sessionId, new ConcurrentLinkedQueue<Builder>());
-        this.list.notifyAll();
       }
+      this.list.notifyAll();
     }
   }
 
@@ -315,17 +316,17 @@ public void sessionDestroyed(HttpSessionEvent arg0) {
         }
         if ((messages = meetings.get(meetingCode)) != null) {
           messages.remove(meetingCode);
-          meetings.notifyAll();
         }
+        meetings.notifyAll();
       }
 
       synchronized (this.list) {
         final String sessionId = arg0.getSession().getId();
         if(this.list.containsKey(sessionId))
         {
           this.list.remove(sessionId);
-          this.list.notifyAll();
         }
+        this.list.notifyAll();
       }
     }
   }