From 09f96af3c673c5f733a1de6970e269df16109ae6 Mon Sep 17 00:00:00 2001 From: Carlos Sanchez Gonzalez Date: Sat, 11 Jul 2009 00:47:19 +0000 Subject: [PATCH] Change the handling of thread local git-svn-id: https://svn.apache.org/repos/asf/continuum/trunk/continuum-webapp-test@793158 13f79535-47bb-0310-9956-ffa450edef68 --- .../web/test/parent/AbstractSeleniumTest.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/test/testng/org/apache/continuum/web/test/parent/AbstractSeleniumTest.java b/src/test/testng/org/apache/continuum/web/test/parent/AbstractSeleniumTest.java index 260c546935..14fd1f01d2 100644 --- a/src/test/testng/org/apache/continuum/web/test/parent/AbstractSeleniumTest.java +++ b/src/test/testng/org/apache/continuum/web/test/parent/AbstractSeleniumTest.java @@ -47,7 +47,7 @@ public abstract class AbstractSeleniumTest public static String maxWaitTimeInMs; - private static ThreadLocal selenium; + private static ThreadLocal selenium = new ThreadLocal(); private static Properties p; @@ -73,17 +73,10 @@ public void open( String baseUrl, String browser, String seleniumHost, int selen throws Exception { this.baseUrl = baseUrl; + if ( getSelenium() == null ) { - final Selenium s = new DefaultSelenium( seleniumHost, seleniumPort, browser, baseUrl ); - selenium = new ThreadLocal() - { - @Override - protected Selenium initialValue() - { - return s; - } - }; + selenium.set( new DefaultSelenium( seleniumHost, seleniumPort, browser, baseUrl ) ); getSelenium().start(); } } @@ -132,6 +125,7 @@ public void close() if ( getSelenium() != null ) { getSelenium().stop(); + selenium.set( null ); } }