This is an automated email from the ASF dual-hosted git repository. zyk pushed a commit to branch rc/1.1.0 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 4aa755de7fa05b15cc98ad7c0b5f1b5caa71fe87 Author: Liao Lanyu <[email protected]> AuthorDate: Mon Mar 20 14:08:57 2023 +0800 [To rel/1.1] Fix possible npe when closing IdentitySinkOperator --- .../iotdb/db/mpp/execution/operator/sink/IdentitySinkOperator.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/sink/IdentitySinkOperator.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/sink/IdentitySinkOperator.java index e4b44508d5..80ac16af92 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/sink/IdentitySinkOperator.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/sink/IdentitySinkOperator.java @@ -26,7 +26,6 @@ import org.apache.iotdb.db.mpp.execution.operator.OperatorContext; import org.apache.iotdb.tsfile.read.common.block.TsBlock; import com.google.common.util.concurrent.ListenableFuture; -import org.apache.commons.lang3.Validate; import java.util.List; @@ -118,8 +117,10 @@ public class IdentitySinkOperator implements Operator { @Override public void close() throws Exception { for (int i = downStreamChannelIndex.getCurrentIndex(), n = children.size(); i < n; i++) { - Validate.notNull(children.get(i)); - children.get(i).close(); + Operator currentChild = children.get(i); + if (currentChild != null) { + currentChild.close(); + } } }
