Repository: cayenne Updated Branches: refs/heads/master a31ae3b7d -> 8eec5d4ed
CAY-1946 CDbimport improvements fixing NPE when no entities are matched Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/8eec5d4e Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/8eec5d4e Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/8eec5d4e Branch: refs/heads/master Commit: 8eec5d4ed3b5cf852441fe8bfb33af9b3b64c466 Parents: a31ae3b Author: Andrus Adamchik <aadamc...@apache.org> Authored: Mon Dec 15 11:15:42 2014 +0300 Committer: Andrus Adamchik <aadamc...@apache.org> Committed: Mon Dec 15 11:15:42 2014 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/cayenne/access/DbLoader.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/8eec5d4e/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoader.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoader.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoader.java index 8b3029e..1b1a828 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoader.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoader.java @@ -53,6 +53,7 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -435,12 +436,11 @@ public class DbLoader { } /** - * Creates an ObjEntity for each DbEntity in the map. ObjEntities are - * created empty without + * Creates an ObjEntity for each DbEntity in the map. */ protected Collection<ObjEntity> loadObjEntities(DataMap map, DbLoaderConfiguration config, Collection<DbEntity> entities) { if (entities.isEmpty()) { - return null; + return Collections.emptyList(); } Collection<ObjEntity> loadedEntities = new ArrayList<ObjEntity>(entities.size());
