Implementing augmentation of previousely augmented instances

gbulicanu · Feb 13, 2014 · 25e8fdf · 25e8fdf
1 parent 12e972a
commit 25e8fdf
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/java/client/src/org/openqa/selenium/remote/Augmenter.java b/java/client/src/org/openqa/selenium/remote/Augmenter.java
@@ -62,10 +62,14 @@ protected <X> X create(RemoteWebDriver driver,
 
   @Override
   protected RemoteWebDriver extractRemoteWebDriver(WebDriver driver) {
-    if (driver.getClass() == RemoteWebDriver.class) {
+    if (driver.getClass() == RemoteWebDriver.class
+        || driver.getClass().getName().startsWith("org.openqa.selenium.remote.RemoteWebDriver$$EnhancerByCGLIB"))
+    {
       return (RemoteWebDriver) driver;
+
     } else {
-      logger.warning("Augmenter should be applied to RemoteWebDriver instances only");
+      logger.warning("Augmenter should be applied to RemoteWebDriver instances " +
+                     "or previously augmented instances only");
       return null;
     }
   }