From 78681fdee8e697dcd1a0d1cea6c4f2c8c43dee36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20P=C3=B6hler?= Date: Fri, 19 Nov 2021 17:56:58 +0100 Subject: [PATCH] Try and fix NPE in MigrationRunner, when DataSource is null --- .../main/java/io/ebeaninternal/server/core/DefaultServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index a927d7c88..30376a6b2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -383,7 +383,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { * Start any services after registering with the ClusterManager. */ public void start() { - if (config.isRunMigration() && TenantMode.DB != config.getTenantMode()) { + if (config.getDataSource() != null && config.isRunMigration() && TenantMode.DB != config.getTenantMode()) { final AutoMigrationRunner migrationRunner = ServiceUtil.service(AutoMigrationRunner.class); if (migrationRunner == null) { throw new IllegalStateException("No AutoMigrationRunner found. Probably ebean-migration is not in the classpath?");