From fe241d8ccee5726f12220d0bfbda72545ddb1a27 Mon Sep 17 00:00:00 2001 From: rob Date: Mon, 20 Feb 2023 09:07:45 +1300 Subject: [PATCH] Tidy internals, use Config.getOptional() when reading datasource.default / ebean.default.datasource --- ebean-api/src/main/java/io/ebean/DbPrimary.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/DbPrimary.java b/ebean-api/src/main/java/io/ebean/DbPrimary.java index 156038f8e..ea1980de6 100644 --- a/ebean-api/src/main/java/io/ebean/DbPrimary.java +++ b/ebean-api/src/main/java/io/ebean/DbPrimary.java @@ -76,9 +76,9 @@ final class DbPrimary { defaultServerName = System.getProperty("db", defaultServerName); defaultServerName = System.getProperty("ebean_db", defaultServerName); if (isEmpty(defaultServerName)) { - defaultServerName = Config.get("datasource.default", null); + defaultServerName = Config.getOptional("datasource.default").orElse(null); if (isEmpty(defaultServerName)) { - defaultServerName = Config.get("ebean.default.datasource", null); + defaultServerName = Config.getOptional("ebean.default.datasource").orElse(null); } } if (defaultServerName == null) {