zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/rel-1.5.3'

Browse source
This commit is contained in:
anhefti 2023-10-31 10:16:41 +01:00
commit 36b2ccb32c
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pom.xml
View file

@ -18,7 +18,7 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<sebserver-version>1.5.2</sebserver-version> <sebserver-version>1.5.3</sebserver-version>
<build-version>${sebserver-version}</build-version> <build-version>${sebserver-version}</build-version>
<revision>${sebserver-version}</revision> <revision>${sebserver-version}</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

13
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ClientConnectionDAOImpl.java
View file

@ -436,9 +436,14 @@ public class ClientConnectionDAOImpl implements ClientConnectionDAO {
@Transactional @Transactional
public Result<Boolean> saveSecurityCheckStatus(final Long connectionId, final Boolean checkStatus) { public Result<Boolean> saveSecurityCheckStatus(final Long connectionId, final Boolean checkStatus) {
return Result.tryCatch(() -> { 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( this.clientConnectionRecordMapper.updateByPrimaryKeySelective(new ClientConnectionRecord(
connectionId, 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), Utils.toByte(checkStatus),
null, null)); null, null));
return checkStatus; return checkStatus;
@ -450,9 +455,13 @@ public class ClientConnectionDAOImpl implements ClientConnectionDAO {
@Transactional @Transactional
public Result<Boolean> saveSEBClientVersionCheckStatus(final Long connectionId, final Boolean checkStatus) { public Result<Boolean> saveSEBClientVersionCheckStatus(final Long connectionId, final Boolean checkStatus) {
return Result.tryCatch(() -> { 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( this.clientConnectionRecordMapper.updateByPrimaryKeySelective(new ClientConnectionRecord(
connectionId, 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))); null, null, Utils.toByte(checkStatus)));
return checkStatus; return checkStatus;
}) })