java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/core/WindowManager.java
... ...
@@ -108,12 +108,18 @@ public class WindowManager {
108 108
}
109 109
110 110
private boolean isDriverAlive(WebDriver driver) {
111
- try {
112
- driver.getWindowHandles();
113
- return true;
114
- } catch (NoSuchSessionException | SessionNotCreatedException e) {
115
- return false;
111
+ boolean result;
112
+ if (driver == null) {
113
+ result = false;
114
+ } else {
115
+ try {
116
+ driver.getWindowHandles();
117
+ result = true;
118
+ } catch (NoSuchSessionException | SessionNotCreatedException e) {
119
+ result = false;
120
+ }
116 121
}
122
+ return result;
117 123
}
118 124
119 125
private void setWindowMaximized(WebDriver driver) {
... ...
@@ -137,6 +143,8 @@ public class WindowManager {
137 143
138 144
public void closeAllWindows() {
139 145
forEachOpenedWindow(WebDriverWindow::close);
146
+ driver.quit();
147
+ driver = null;
140 148
}
141 149
142 150
private class ManagedWebDriverWindow extends WebDriverWindow {