hotfix to register externally created driver outside of IDriverPool

zebrunner · May 7, 2021 · 650d77d · 650d77d
1 parent 3e6192a
commit 650d77d
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/...ain/java/com/qaprosoft/carina/core/foundation/webdriver/decorator/ExtendedWebElement.java b/...ain/java/com/qaprosoft/carina/core/foundation/webdriver/decorator/ExtendedWebElement.java
@@ -63,6 +63,7 @@
 
 import com.qaprosoft.carina.core.foundation.commons.SpecialKeywords;
 import com.qaprosoft.carina.core.foundation.crypto.CryptoTool;
+import com.qaprosoft.carina.core.foundation.exception.DriverPoolException;
 import com.qaprosoft.carina.core.foundation.performance.ACTION_NAME;
 import com.qaprosoft.carina.core.foundation.utils.Configuration;
 import com.qaprosoft.carina.core.foundation.utils.Configuration.Parameter;
@@ -230,7 +231,13 @@ private ExtendedWebElement(WebElement element) {
 				}
 				//this.driver = (WebDriver) tempSearchContext;
 				// that's the only place to use DriverPool to get driver.
-				this.driver = IDriverPool.getDriver(sessionId);
+                try {
+                    //try to search securely in driver pool by sessionId
+                    this.driver = IDriverPool.getDriver(sessionId);
+                } catch (DriverPoolException ex) {
+                    // seems like driver started outside of IDriverPool so try to register it as well
+                    this.driver = (WebDriver) tempSearchContext;
+                }
 			} else {
 				LOGGER.error("Undefined error for searchContext: " + tempSearchContext.toString());
 			}