From 2c7f4b8e0915399ddf3b3aca7969391cb12edb04 Mon Sep 17 00:00:00 2001 From: anhefti Date: Wed, 14 Jun 2023 15:36:43 +0200 Subject: [PATCH] SEBSERV-451 fixed --- .../session/impl/ExamSessionServiceImpl.java | 14 ++++++++------ src/main/resources/messages.properties | 6 +++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionServiceImpl.java index d8d89ff9..a227cc04 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionServiceImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionServiceImpl.java @@ -642,12 +642,14 @@ public class ExamSessionServiceImpl implements ExamSessionService { final ClientConnectionDataInternal cc = this.examSessionCacheService.getClientConnection(token); if (cc.clientConnection.status.duplicateCheckStatus) { - final Long id = this.duplicateCheck.put( - cc.clientConnection.userSessionId, - cc.getConnectionId()); - if (id != null) { - duplicates.add(id); - duplicates.add(cc.getConnectionId()); + if (cc.clientConnection.userSessionId != null) { + final Long id = this.duplicateCheck.put( + cc.clientConnection.userSessionId, + cc.getConnectionId()); + if (id != null) { + duplicates.add(id); + duplicates.add(cc.getConnectionId()); + } } } return cc; diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties index 2fdf79e6..6af4ca76 100644 --- a/src/main/resources/messages.properties +++ b/src/main/resources/messages.properties @@ -675,14 +675,14 @@ sebserver.exam.configuration.form.title.new=Add exam configuration mapping sebserver.exam.configuration.form.title=Exam Configuration Mapping sebserver.exam.configuration.form.name=Exam Configuration sebserver.exam.configuration.form.name.tooltip=Please select an exam configuration to attach to the exam -sebserver.exam.configuration.form.encryptSecret=Encryption Password -sebserver.exam.configuration.form.encryptSecret.tooltip=Define an encryption password if the exam configuration should be encrypted by password +sebserver.exam.configuration.form.encryptSecret=Settings Password +sebserver.exam.configuration.form.encryptSecret.tooltip=Define an encryption password if the exam configuration settings should be encrypted by password sebserver.exam.configuration.form.description=Description sebserver.exam.configuration.form.description.tooltip=The description of the selected exam configuration sebserver.exam.configuration.form.status=Status sebserver.exam.configuration.form.status.tooltip=The current status of the selected exam configuration sebserver.exam.configuration.form.encryptSecret.confirm=Confirm Password -sebserver.exam.configuration.form.encryptSecret.confirm.tooltip=Please confirm the encryption password if there is one +sebserver.exam.configuration.form.encryptSecret.confirm.tooltip=Please confirm the settings password if there is one sebserver.exam.indicator.list.actions=  sebserver.exam.indicator.list.title=Indicators