From 204a28df94c0dd226165f145c02833ba503cc5ea Mon Sep 17 00:00:00 2001
From: Robin Neatherway <robin@semmle.com>
Date: Fri, 5 Jul 2019 12:41:46 +0100
Subject: [PATCH] Java: Add `isNotEmpty` to NullGuards

---
 java/ql/src/semmle/code/java/dataflow/NullGuards.qll | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/java/ql/src/semmle/code/java/dataflow/NullGuards.qll b/java/ql/src/semmle/code/java/dataflow/NullGuards.qll
index bb946fc88f6..43425f2f908 100644
--- a/java/ql/src/semmle/code/java/dataflow/NullGuards.qll
+++ b/java/ql/src/semmle/code/java/dataflow/NullGuards.qll
@@ -120,6 +120,14 @@ predicate nullCheckMethod(Method m, boolean branch, boolean isnull) {
   m.hasName("isBlank") and
   branch = false and
   isnull = false
+  or
+  (
+    m.getDeclaringType().hasQualifiedName("org.apache.commons.collections4", "CollectionUtils") or
+    m.getDeclaringType().hasQualifiedName("org.apache.commons.collections", "CollectionUtils")
+  ) and
+  m.hasName("isNotEmpty") and
+  branch = true and
+  isnull = false
 }
 
 /**