From fad45e24d225746ab14b698840822ae56ce54b75 Mon Sep 17 00:00:00 2001 From: janghs Date: Tue, 16 Apr 2024 14:08:34 +0900 Subject: [PATCH] Changed to isEmpty after null check. --- .../ibatis/executor/resultset/DefaultResultSetHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java b/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java index f99239f0b9d..a5ae14b7ba8 100644 --- a/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java +++ b/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java @@ -602,7 +602,7 @@ private void linkToParents(ResultSet rs, ResultMapping parentMapping, Object row CacheKey parentKey = createKeyForMultipleResults(rs, parentMapping, parentMapping.getColumn(), parentMapping.getForeignColumn()); List parents = pendingRelations.get(parentKey); - if (!parents.isEmpty()) { + if (parents != null && !parents.isEmpty()) { for (PendingRelation parent : parents) { if (parent != null && rowValue != null) { linkObjects(parent.metaObject, parent.propertyMapping, rowValue);