Merge pull request #3171 from Cousjava/PAYARA-3098-delete-running-domain

PAYARA-3098 delete-domain will now not run if domain is running
payara · Sep 27, 2018 · 27d2a29 · 27d2a29
2 parents 6df1a55 + 6421f36
commit 27d2a29
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/...server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/LocalServerCommand.java b/...server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/LocalServerCommand.java
@@ -292,6 +292,7 @@ protected final boolean isThisServer(File ourDir, String directoryKey) {
         logger.log(Level.FINER, "Check if server is at location {0}", ourDir);
 
         try {
+            programOpts.setHostAndPort(getAdminAddress());
             RemoteCLICommand cmd = new RemoteCLICommand("__locations", programOpts, env);
             ActionReport report = cmd.executeAndReturnActionReport("__locations");
             String theirDirPath = report.findProperty(directoryKey);