java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/MarkPassingCalculator.java
... ...
@@ -589,7 +589,7 @@ public class MarkPassingCalculator {
589 589
// creation matches that of this mark passing calculator's race; load instead of compute
590 590
updateMarkPassingsFromRegistry();
591 591
queue.clear();
592
- stop(); // ensures an end marker is written to queue to the queue.take() call in Listen.run() will always get unblocked after the queue.clear() above
592
+ stop(); // ensures an end marker is written to queue so the queue.take() call in Listen.run() will always get unblocked after the queue.clear() above
593 593
suspended = false;
594 594
} else {
595 595
suspended = false;
java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/WindowManager.java
... ...
@@ -5,6 +5,7 @@ import java.util.Set;
5 5
import java.util.function.BiConsumer;
6 6
import java.util.function.Consumer;
7 7
import java.util.function.Supplier;
8
+import java.util.logging.Logger;
8 9
9 10
import org.openqa.selenium.Dimension;
10 11
import org.openqa.selenium.JavascriptExecutor;
... ...
@@ -21,6 +22,8 @@ import org.openqa.selenium.support.ui.WebDriverWait;
21 22
* Riccardo Nimser (D049941)
22 23
*/
23 24
public class WindowManager {
25
+ private static final Logger logger = Logger.getLogger(WindowManager.class.getName());
26
+
24 27
private WebDriverWindow defaultWindow;
25 28
private final Set<WebDriverWindow> allWindows = new HashSet<>();
26 29
private WebDriver driver;
... ...
@@ -144,7 +147,13 @@ public class WindowManager {
144 147
public void closeAllWindows() {
145 148
forEachOpenedWindow(WebDriverWindow::close);
146 149
if (driver != null) {
147
- driver.quit();
150
+ try {
151
+ driver.close();
152
+ driver.quit();
153
+ } catch (org.openqa.selenium.NoSuchSessionException e) {
154
+ logger.warning("The Selenium driver seems to have already been closed");
155
+ // Already closed — ignore
156
+ }
148 157
driver = null;
149 158
}
150 159
}
java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/JumpyTrackSmootheningTest.java
... ...
@@ -290,7 +290,6 @@ public class JumpyTrackSmootheningTest {
290 290
addFixedMarkPassingToRaceLog("2020-10-14T18:21:38Z", gallagherZelenka, 4, raceLog);
291 291
trackedRace.setStatus(new TrackedRaceStatusImpl(TrackedRaceStatusEnum.LOADING, 0.0));
292 292
final DynamicGPSFixTrack<Competitor, GPSFixMoving> competitorTrackInRace = trackedRace.getTrack(gallagherZelenka);
293
- // TODO switch race into suspended mode to avoid updates during mass fix insertion:
294 293
competitorTrack.lockForRead();
295 294
try {
296 295
for (final GPSFixMoving fix : competitorTrack.getRawFixes()) {
... ...
@@ -300,7 +299,6 @@ public class JumpyTrackSmootheningTest {
300 299
competitorTrack.unlockAfterRead();
301 300
}
302 301
trackedRace.setStatus(new TrackedRaceStatusImpl(TrackedRaceStatusEnum.TRACKING, 1.0));
303
- // TODO resume race
304 302
return trackedRace;
305 303
}
306 304