From 48c621490d0a2cd9ba5d315ebb4a95d1c502e291 Mon Sep 17 00:00:00 2001 From: anhefti Date: Tue, 3 Oct 2023 07:59:17 +0200 Subject: [PATCH 1/3] prepare for 1.5.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9c987aba..c087e4d5 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ jar - 1.5.2 + 1.5.3-SNAPSHOT ${sebserver-version} ${sebserver-version} UTF-8 From 775f98d968c9e044289f000f01e48eb604da8ba7 Mon Sep 17 00:00:00 2001 From: anhefti Date: Mon, 30 Oct 2023 13:15:29 +0100 Subject: [PATCH 2/3] SEBSERV-474 fix --- .../dao/impl/ClientConnectionDAOImpl.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ClientConnectionDAOImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ClientConnectionDAOImpl.java index ba0abd37..a5ced324 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ClientConnectionDAOImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ClientConnectionDAOImpl.java @@ -436,9 +436,14 @@ public class ClientConnectionDAOImpl implements ClientConnectionDAO { @Transactional public Result saveSecurityCheckStatus(final Long connectionId, final Boolean checkStatus) { return Result.tryCatch(() -> { + + // NOTE: we use nanoseconds here to get a better precision to better avoid + // same value of real concurrent calls on distributed systems + final long nanosecondsNow = System.nanoTime(); this.clientConnectionRecordMapper.updateByPrimaryKeySelective(new ClientConnectionRecord( connectionId, - null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, + null, null, null, null, null, null, null, null, null, null, nanosecondsNow, null, null, null, null, + null, Utils.toByte(checkStatus), null, null)); return checkStatus; @@ -450,9 +455,13 @@ public class ClientConnectionDAOImpl implements ClientConnectionDAO { @Transactional public Result saveSEBClientVersionCheckStatus(final Long connectionId, final Boolean checkStatus) { return Result.tryCatch(() -> { + // NOTE: we use nanoseconds here to get a better precision to better avoid + // same value of real concurrent calls on distributed systems + final long nanosecondsNow = System.nanoTime(); this.clientConnectionRecordMapper.updateByPrimaryKeySelective(new ClientConnectionRecord( connectionId, - null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, + null, null, null, null, null, null, null, null, null, null, nanosecondsNow, null, null, null, null, + null, null, null, Utils.toByte(checkStatus))); return checkStatus; }) From c257c559ce2ab358b1b1c8114d2b3af66e6e60bd Mon Sep 17 00:00:00 2001 From: anhefti Date: Tue, 31 Oct 2023 09:45:12 +0100 Subject: [PATCH 3/3] prepare for next patch release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c087e4d5..e4179de8 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ jar - 1.5.3-SNAPSHOT + 1.5.3 ${sebserver-version} ${sebserver-version} UTF-8