Stop iterating field path when variable value is out of array boundary.

1 files changed, 2 insertions, 1 deletions

diff --git a/document/src/main/java/com/yahoo/document/datatypes/Array.java b/document/src/main/java/com/yahoo/document/datatypes/Array.java
index 01326bcea62..8f6b68fcc38 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/Array.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/Array.java
@@ -303,11 +303,12 @@ public final class Array<T extends FieldValue> extends CollectionFieldValue<T> i
 
                         if (idx < values.size()) {
                             return iterateSubset(idx, idx, fieldPath, null, pos + 1, handler);
+                        } else {
+                            return FieldPathIteratorHandler.ModificationStatus.NOT_MODIFIED;
                         }
                     } else {
                         return iterateSubset(0, values.size() - 1, fieldPath, fieldPath.get(pos).getVariableName(), pos + 1, handler);
                     }
-                    break;
                 }
                 default:
             }