java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/mining/test/PolarDataMinerTest.java
... ...
@@ -137,10 +137,10 @@ public class PolarDataMinerTest {
137 137
}
138 138
139 139
int millisLeft = 500000;
140
- while (miner.isCurrentlyActiveAndOrHasQueue() && millisLeft > 0) {
140
+ while (miner.isCurrentlyActiveOrHasQueue() && millisLeft > 0) {
141 141
Thread.sleep(100);
142 142
millisLeft = millisLeft - 100;
143
- if (miner.isCurrentlyActiveAndOrHasQueue() && millisLeft <= 0) {
143
+ if (miner.isCurrentlyActiveOrHasQueue() && millisLeft <= 0) {
144 144
throw new TimeoutException();
145 145
}
146 146
}
java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/PolarDataServiceImpl.java
... ...
@@ -83,8 +83,8 @@ public class PolarDataServiceImpl extends AbstractReplicableWithObjectInputStrea
83 83
this.polarDataMiner = new PolarDataMiner(settings, cubicRegressionPerCourseProcessor, speedRegressionPerAngleClusterProcessor, angleClusterGroup);
84 84
}
85 85
86
- public boolean isCurrentlyActiveAndOrHasQueue() {
87
- return polarDataMiner.isCurrentlyActiveAndOrHasQueue();
86
+ public boolean isCurrentlyActiveOrHasQueue() {
87
+ return polarDataMiner.isCurrentlyActiveOrHasQueue();
88 88
}
89 89
90 90
private ClusterGroup<Bearing> createAngleClusterGroup() {
java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/PolarDataMiner.java
... ...
@@ -228,7 +228,7 @@ public class PolarDataMiner {
228 228
}
229 229
}
230 230
231
- public boolean isCurrentlyActiveAndOrHasQueue() {
231
+ public boolean isCurrentlyActiveOrHasQueue() {
232 232
boolean isActive = executor.getActiveCount() > 0;
233 233
boolean hasQueue = executor.getQueue().size() > 0;
234 234
return isActive || hasQueue;
java/com.sap.sailing.windestimation.test/src/com/sap/sailing/windestimation/integration/IncrementalMstHmmWindEstimationForTrackedRaceTest.java
... ...
@@ -140,7 +140,7 @@ public class IncrementalMstHmmWindEstimationForTrackedRaceTest extends OnlineTra
140 140
final PolarDataServiceImpl polarDataService = new PolarDataServiceImpl();
141 141
getTrackedRace().setPolarDataService(polarDataService);
142 142
polarDataService.insertExistingFixes(getTrackedRace());
143
- Wait.wait(()->!polarDataService.isCurrentlyActiveAndOrHasQueue(), /* timeout */ Optional.of(Duration.ONE_MINUTE),
143
+ Wait.wait(()->!polarDataService.isCurrentlyActiveOrHasQueue(), /* timeout */ Optional.of(Duration.ONE_MINUTE),
144 144
/* sleepBetweenAttempts */ Duration.ONE_SECOND.times(5), Level.INFO, "Waiting for polar data service to finish computing");
145 145
OnlineTracTracBasedTest.fixApproximateMarkPositionsForWindReadOut(getTrackedRace(), timePointForFixes);
146 146
final IncrementalWindEstimation windEstimation = windEstimationFactoryService.createIncrementalWindEstimationTrack(getTrackedRace());
java/com.sap.sse.landscape.aws/src/com/sap/sse/landscape/aws/impl/AwsApplicationReplicaSetImpl.java
... ...
@@ -15,6 +15,7 @@ import java.util.logging.Level;
15 15
import java.util.logging.Logger;
16 16
import java.util.stream.IntStream;
17 17
18
+import com.sap.sailing.landscape.common.SharedLandscapeConstants;
18 19
import com.sap.sse.ServerInfo;
19 20
import com.sap.sse.common.Duration;
20 21
import com.sap.sse.common.HttpRequestHeaderConstants;
... ...
@@ -332,7 +333,7 @@ implements AwsApplicationReplicaSet<ShardingKey, MetricsT, ProcessT> {
332 333
// or no load balancer forwards to it; in any case we can only default to the assumption that the process may be an archive
333 334
// server:
334 335
if (getName().equals(ARCHIVE_SERVER_NAME)) {
335
- setHostname("www.sapsailing.com"); // TODO this should probably be archive-failover.sapsailing.com for the fail-over ARCHIVE server
336
+ setHostname("www."+SharedLandscapeConstants.DEFAULT_DOMAIN_NAME); // TODO this should probably be archive-failover.sapsailing.com for the fail-over ARCHIVE server; TODO bug6208: use something other than "www" for the ARCHIVE
336 337
} else {
337 338
logger.warning("Found an application replica set " + getName() + " that is not the "
338 339
+ ARCHIVE_SERVER_NAME + " replica set; no hostname can be inferred.");