From 75395a848174318d44708ae49ad33fe3e07aa579 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Tue, 7 Aug 2018 11:55:06 +1200
Subject: [PATCH] #1464 - NPE in
 PropertiesWrapper.internalGet(PropertiesWrapper.java:74) running
 multi-platform DB migration generation with ServerConfig that has no
 properties

Note that newPlatformConfig() is only used for multi-platform DB migration generation.
---
 src/main/java/io/ebean/config/ServerConfig.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index 088ec3663..30e6e92f1 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -3130,9 +3130,10 @@ public class ServerConfig {
    * @return A copy of the PlatformConfig with overridden properties
    */
   public PlatformConfig newPlatformConfig(String propertiesPath, String platformPrefix) {
-
+    if (properties == null) {
+      properties = new Properties();
+    }
     PropertiesWrapper p = new PropertiesWrapper(propertiesPath, platformPrefix, properties, classLoadConfig);
-
     PlatformConfig config = new PlatformConfig(platformConfig);
     config.loadSettings(p);
     return config;