indexof evaluation for nulls

cqframework · Jun 17, 2024 · ee95bfb · ee95bfb
1 parent a2a380b
commit ee95bfb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/Src/java/engine-fhir/src/test/java/org/hl7/fhirpath/CQLOperationsR4Test.java b/Src/java/engine-fhir/src/test/java/org/hl7/fhirpath/CQLOperationsR4Test.java
@@ -109,8 +109,6 @@ public static Object[][] dataMethod() {
  "cql/CqlListOperatorsTest/Equivalent/Equivalent123AndString123",
  "cql/CqlListOperatorsTest/Equivalent/EquivalentABCAnd123",
  "cql/CqlListOperatorsTest/Flatten/FlattenListNullAndNull",
- "cql/CqlListOperatorsTest/IndexOf/IndexOfEmptyNull",
- "cql/CqlListOperatorsTest/IndexOf/IndexOfNullIn1Null",
  "cql/CqlListOperatorsTest/NotEqual/NotEqual123AndABC",
  "cql/CqlListOperatorsTest/NotEqual/NotEqual123AndString123",
  "cql/CqlListOperatorsTest/NotEqual/NotEqualABCAnd123",

diff --git a/Src/java/engine/src/main/java/org/opencds/cqf/cql/engine/elm/executing/IndexOfEvaluator.java b/Src/java/engine/src/main/java/org/opencds/cqf/cql/engine/elm/executing/IndexOfEvaluator.java
@@ -9,13 +9,13 @@
 The operator uses the notion of equivalence to determine the index. The search is linear,
  and returns the index of the first element that is equivalent to the element being searched for.
 If the list is empty, or no element is found, the result is -1.
-If the list argument is null, the result is null.
+If either argument is null, the result is null.
 */
 
 public class IndexOfEvaluator {
 
  public static Object indexOf(Object source, Object elementToFind, State state) {
- if (source == null) {
+ if (source == null || elementToFind == null) {
  return null;
  }