From a161d0c01b1f11477feba0c74197e233c980689f Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Tue, 7 Aug 2018 11:36:26 +1200 Subject: [PATCH] #1463 - NPE in MigrationModel.readMigrations() when running using File resources with no migration directory --- .../io/ebeaninternal/dbmigration/model/MigrationModel.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java b/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java index f12283c05..a27feb783 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java +++ b/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java @@ -42,9 +42,10 @@ public class MigrationModel { // find all the migration xml files File[] xmlFiles = modelDirectory.listFiles(pathname -> pathname.getName().toLowerCase().endsWith(modelSuffix)); - + if (xmlFiles == null || xmlFiles.length == 0) { + return; + } List resources = new ArrayList<>(xmlFiles.length); - for (File xmlFile : xmlFiles) { resources.add(new MigrationResource(xmlFile, createVersion(xmlFile))); }