ExpectedConditions.presenceOfNestedElementsLocatedBy should check tha…

…t at least one element is returned Fixes SeleniumHQ#3214
queyong · Dec 7, 2016 · bc10e16 · bc10e16
1 parent 465ef4d
commit bc10e16
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/java/client/src/org/openqa/selenium/support/ui/ExpectedConditions.java b/java/client/src/org/openqa/selenium/support/ui/ExpectedConditions.java
@@ -1361,7 +1361,10 @@ public List<WebElement> apply(WebDriver webDriver) {
         try {
           elements = webDriver.findElement(locator).findElements(sub_locator);
         } catch (Exception e) {/**/}
-        return elements;
+        if (elements != null && elements.size() > 0) {
+          return elements;
+        }
+        return null;
       }
 
       @Override