From fb0fc2aec00e4764e20722873b8840ac9d70176d Mon Sep 17 00:00:00 2001
From: anhefti <andreas.hefti@let.ethz.ch>
Date: Tue, 16 Nov 2021 10:11:29 +0100
Subject: [PATCH] cache and connection improvements

---
 .../exam/impl/SEBClientEventAdminServiceImpl.java        | 2 +-
 .../session/impl/SEBClientConnectionServiceImpl.java     | 9 +++++----
 src/main/resources/config/ehcache.xml                    | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/impl/SEBClientEventAdminServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/impl/SEBClientEventAdminServiceImpl.java
index 3c395bdd..be4219f0 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/impl/SEBClientEventAdminServiceImpl.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/impl/SEBClientEventAdminServiceImpl.java
@@ -225,7 +225,7 @@ public class SEBClientEventAdminServiceImpl implements SEBClientEventAdminServic
         private final String sort;
 
         private int pageNumber = 1;
-        private final int pageSize = 100;
+        private final int pageSize = 1000;
 
         private Collection<ClientEventRecord> nextRecords;
 
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java
index 0e476e64..804f560b 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java
@@ -280,10 +280,11 @@ public class SEBClientConnectionServiceImpl implements SEBClientConnectionServic
                     return clientConnection;
                 } else {
                     // It seems that this is a request from an other device then the original
-                    log.error("ClientConnection integrity violation: client connection mismatch: {}",
-                            clientConnection);
-                    throw new IllegalArgumentException(
-                            "ClientConnection integrity violation: client connection mismatch");
+                    log.warn(
+                            "SEB retired to establish an already established client connection with another IP address. Client adress: {} : {}",
+                            clientConnection.clientAddress,
+                            clientAddress);
+                    return clientConnection;
                 }
             } else if (!clientConnection.status.clientActiveStatus) {
                 log.error("ClientConnection integrity violation: client connection is not in expected state: {}",
diff --git a/src/main/resources/config/ehcache.xml b/src/main/resources/config/ehcache.xml
index 6161391b..328874b7 100644
--- a/src/main/resources/config/ehcache.xml
+++ b/src/main/resources/config/ehcache.xml
@@ -86,7 +86,7 @@
         <key-type>java.lang.String</key-type>
         <value-type>ch.ethz.seb.sebserver.gbl.model.exam.QuizData</value-type>
         <expiry>
-            <ttl unit="minutes">1</ttl>
+            <ttl unit="minutes">5</ttl>
         </expiry>
         <resources>
             <heap unit="entries">10000</heap>