code cleanup and logging improvement

SafeExamBrowser · Jan 6, 2025 · c21ac6b · c21ac6b
1 parent 5c1a4f7
commit c21ac6b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/ch/ethz/seb/sps/server/servicelayer/impl/ProctoringCacheService.java b/src/main/java/ch/ethz/seb/sps/server/servicelayer/impl/ProctoringCacheService.java
@@ -64,7 +64,7 @@ public Group getActiveGroup(final String groupUUID) {
         } else {
             final Group group = groupResult.get();
             if (group.terminationTime != null) {
-                log.error("Group: {} is not active anymore. Skip caching", group);
+                log.error("Group: {} is not active anymore. Skip caching", group.name);
                 return null;
             }
             return group;

diff --git a/src/main/java/ch/ethz/seb/sps/server/servicelayer/impl/ProctoringServiceImpl.java b/src/main/java/ch/ethz/seb/sps/server/servicelayer/impl/ProctoringServiceImpl.java
@@ -392,9 +392,11 @@ public void clearGroupCache(final String groupUUID, final boolean fully) {
 
         if (fully) {
             final Group activeGroup = this.proctoringCacheService.getActiveGroup(groupUUID);
-            this.proctoringCacheService
-                    .getLiveSessionTokens(activeGroup.uuid)
-                    .forEach(this.proctoringCacheService::evictSession);
+            if (activeGroup != null) {
+                this.proctoringCacheService
+                        .getLiveSessionTokens(activeGroup.uuid)
+                        .forEach(this.proctoringCacheService::evictSession);
+            }
         }
         this.proctoringCacheService.evictGroup(groupUUID);
     }