| Index: patch.diff
|
| ===================================================================
|
| --- patch.diff (revision 228549)
|
| +++ patch.diff (working copy)
|
| @@ -63,7 +63,7 @@
|
| HttpResponse response = fallBackExecute(context, httpMethod);
|
| log(LogType.PROFILER, new HttpProfilerLogEntry(command.getName(), false));
|
| diff --git a/java/client/test/org/openqa/selenium/testing/JUnit4TestBase.java b/java/client/test/org/openqa/selenium/testing/JUnit4TestBase.java
|
| -index e5beaf1..5eb4477 100755
|
| +index e5beaf1..5c99be1 100755
|
| --- a/java/client/test/org/openqa/selenium/testing/JUnit4TestBase.java
|
| +++ b/java/client/test/org/openqa/selenium/testing/JUnit4TestBase.java
|
| @@ -28,6 +28,7 @@
|
| @@ -74,7 +74,7 @@
|
| import org.openqa.selenium.environment.GlobalTestEnvironment;
|
| import org.openqa.selenium.environment.InProcessTestEnvironment;
|
| import org.openqa.selenium.environment.TestEnvironment;
|
| -@@ -94,6 +95,22 @@ public WebDriver getWrappedDriver() {
|
| +@@ -94,6 +95,18 @@ public WebDriver getWrappedDriver() {
|
| public static WebDriver actuallyCreateDriver() {
|
| WebDriver driver = storedDriver.get();
|
|
|
| @@ -86,26 +86,33 @@
|
| + if (driver != null)
|
| + driver.getCurrentUrl();
|
| + } catch (WebDriverException e) {
|
| -+ try {
|
| -+ driver.quit();
|
| -+ } catch (RuntimeException ignored) {
|
| -+ // fall through
|
| -+ logger.warning(ignored.getMessage());
|
| -+ }
|
| ++ driver.quit();
|
| + driver = null;
|
| + }
|
| ++
|
| if (driver == null) {
|
| driver = new WebDriverBuilder().get();
|
| storedDriver.set(driver);
|
| -@@ -116,6 +133,7 @@ public static void removeDriver() {
|
| - current.quit();
|
| - } catch (RuntimeException ignored) {
|
| - // fall through
|
| -+ logger.warning(ignored.getMessage());
|
| +@@ -107,17 +120,11 @@ public static void removeDriver() {
|
| }
|
|
|
| + WebDriver current = storedDriver.get();
|
| +-
|
| + if (current == null) {
|
| + return;
|
| + }
|
| +
|
| +- try {
|
| +- current.quit();
|
| +- } catch (RuntimeException ignored) {
|
| +- // fall through
|
| +- }
|
| +-
|
| ++ current.quit();
|
| storedDriver.remove();
|
| -@@ -126,4 +144,4 @@ protected boolean isIeDriverTimedOutException(IllegalStateException e) {
|
| + }
|
| +
|
| +@@ -126,4 +133,4 @@ protected boolean isIeDriverTimedOutException(IllegalStateException e) {
|
| return e.getClass().getName().contains("TimedOutException");
|
| }
|
|
|
|
|