From 5141c38e298b9ffa1bd5a4c7387577bd0e3bc7bf Mon Sep 17 00:00:00 2001
From: Cheryl King <cheryllk@us.ibm.com>
Date: Thu, 27 Jun 2019 11:11:48 -0500
Subject: [PATCH] Fix embedded server to handle null outputDir and userDir

---
 .../wasdev/wlp/ant/types/EmbeddedServerInfo.java    | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/wasdev/wlp/ant/types/EmbeddedServerInfo.java b/src/main/java/net/wasdev/wlp/ant/types/EmbeddedServerInfo.java
index 04822784..c338702e 100644
--- a/src/main/java/net/wasdev/wlp/ant/types/EmbeddedServerInfo.java
+++ b/src/main/java/net/wasdev/wlp/ant/types/EmbeddedServerInfo.java
@@ -49,9 +49,16 @@ public File getOutputDir() {
 
     public boolean equals(EmbeddedServerInfo info) {
         return 
-            this.serverName.equals(info.serverName)
-            && this.userDir.getAbsolutePath().equals(info.userDir.getAbsolutePath())
-            && this.outputDir.getAbsolutePath().equals(info.outputDir.getAbsolutePath());
+            this.serverName.equals(info.serverName) &&
+            areFilesEqual(this.userDir, info.userDir) &&
+            areFilesEqual(this.outputDir, info.outputDir);
+    }
+
+    private boolean areFilesEqual(File file1, File file2) {
+        if (file1 != null && file2 != null) {
+           return file1.getAbsolutePath().equals(file2.getAbsolutePath());
+        }
+        return (file1 == null && file2 == null);
     }
 
     public static class EmbeddedServers {