Changeset 1821 for trunk

Timestamp:

11/13/14 15:23:46 (10 years ago)

Author:

pharms

Message:

• bugfix for duplicate client ids

File:

• trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorLogManager.java (modified) (5 diffs)

trunk/autoquest-htmlmonitor/src/main/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorLogManager.java

@@ -119 +119 @@
                               HtmlEvent[]     events)
     {
-        HtmlMonitorOutputWriter writer = writers.get(clientInfos.getClientId());
+        HtmlMonitorOutputWriter writer =
+            writers.get(clientInfos.getClientId() + clientInfos.getUrl());
         
         try {
             if (writer == null) {
                 synchronized (this) {
-                    writer = writers.get(clientInfos.getClientId());
+                    writer = writers.get(clientInfos.getClientId() + clientInfos.getUrl());
                     if (writer == null) {
                         writer = new HtmlMonitorOutputWriter
@@ -132 +133 @@
                         writer.init();
                         writer.start();
-                        writers.put(clientInfos.getClientId(), writer);
+                        writers.put(clientInfos.getClientId() + clientInfos.getUrl(), writer);
                     }
                 }
@@ -147 +148 @@
             // determine, if the writer exists but is not able to log something. In this case,
             // destroy the writer (part of the message may be logged twice through this).
-            writer = writers.get(clientInfos.getClientId());
+            writer = writers.get(clientInfos.getClientId() + clientInfos.getUrl());
             if (writer != null) {
                 try {
@@ -154 +155 @@
                 catch (Exception e1) {
                     synchronized (this) {
-                        writers.remove(clientInfos.getClientId());
+                        writers.remove(clientInfos.getClientId() + clientInfos.getUrl());
                         writer.stop();
                     }
@@ -186 +187 @@
                 }
                 
-                for (String clientId : timeoutSessions) {
-                    HtmlMonitorOutputWriter writer = writers.remove(clientId);
+                for (String sessionId : timeoutSessions) {
+                    HtmlMonitorOutputWriter writer = writers.remove(sessionId);
                     writer.stop();
                 }