Index: patch.diff |
=================================================================== |
--- patch.diff (revision 228497) |
+++ 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..41e2791 100755 |
+index e5beaf1..5eb4477 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,21 @@ public WebDriver getWrappedDriver() { |
+@@ -94,6 +95,22 @@ public WebDriver getWrappedDriver() { |
public static WebDriver actuallyCreateDriver() { |
WebDriver driver = storedDriver.get(); |
@@ -90,13 +90,22 @@ |
+ driver.quit(); |
+ } catch (RuntimeException ignored) { |
+ // fall through |
++ logger.warning(ignored.getMessage()); |
+ } |
+ driver = null; |
+ } |
if (driver == null) { |
driver = new WebDriverBuilder().get(); |
storedDriver.set(driver); |
-@@ -126,4 +142,4 @@ protected boolean isIeDriverTimedOutException(IllegalStateException e) { |
+@@ -116,6 +133,7 @@ public static void removeDriver() { |
+ current.quit(); |
+ } catch (RuntimeException ignored) { |
+ // fall through |
++ logger.warning(ignored.getMessage()); |
+ } |
+ |
+ storedDriver.remove(); |
+@@ -126,4 +144,4 @@ protected boolean isIeDriverTimedOutException(IllegalStateException e) { |
return e.getClass().getName().contains("TimedOutException"); |
} |