Merge pull request #5093 from vespa-engine/freva/set-environment-resolver-defaults

Set Environment resolver defaults

1 files changed, 8 insertions, 5 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/Environment.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/Environment.java
index 06663b3f0f5..c093865fb88 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/Environment.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/Environment.java
@@ -336,11 +336,14 @@ public class Environment {
         }
 
         public Environment build() {
-            return new Environment(configServerURIs, environment, region, parentHostHostname, inetAddressResolver,
-                                   pathResolver, logstashNodes, feedEndpoint,
-                                   Optional.ofNullable(keyStoreOptions), Optional.ofNullable(trustStoreOptions),
-                                   Optional.ofNullable(athenzIdentity),
-                                   nodeType);
+            return new Environment(configServerURIs, environment, region, parentHostHostname,
+                    Optional.ofNullable(inetAddressResolver).orElseGet(InetAddressResolver::new),
+                    Optional.ofNullable(pathResolver).orElseGet(PathResolver::new),
+                    logstashNodes, feedEndpoint,
+                    Optional.ofNullable(keyStoreOptions),
+                    Optional.ofNullable(trustStoreOptions),
+                    Optional.ofNullable(athenzIdentity),
+                    nodeType);
         }
     }
 }