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

SEBSERV-303 fixed by taking samples first value then current-time

Browse source
This commit is contained in:
anhefti 2022-05-04 08:31:24 +02:00
parent 938dafc0dd
commit 5229906f69
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/indicator/PingIntervalClientIndicator.java
View file

@ -76,19 +76,18 @@ public final class PingIntervalClientIndicator extends AbstractPingIndicator {
return Double.NaN; return Double.NaN;
} }
// take samples, current value before current time to prevent negative ping times
final double value = this.currentValue;
final long currentTimeMillis = DateTimeUtils.currentTimeMillis();
if (this.initialized && !this.cachingEnabled && this.active if (this.initialized && !this.cachingEnabled && this.active
&& this.lastUpdate != this.distributedIndicatorValueService.lastUpdate()) { && this.lastUpdate != this.distributedIndicatorValueService.lastUpdate()) {
final long currentTimeMillis = DateTimeUtils.currentTimeMillis();
this.currentValue = computeValueAt(currentTimeMillis); this.currentValue = computeValueAt(currentTimeMillis);
this.lastUpdate = this.distributedIndicatorValueService.lastUpdate(); this.lastUpdate = this.distributedIndicatorValueService.lastUpdate();
return (currentTimeMillis < this.currentValue)
? DateTimeUtils.currentTimeMillis() - this.currentValue
: currentTimeMillis - this.currentValue;
} else {
return DateTimeUtils.currentTimeMillis() - this.currentValue;
} }
return currentTimeMillis - value;
} }
@Override @Override