Fix embedded server to handle null outputDir and userDir

cherylking · Jun 28, 2019 · 5141c38 · 5141c38
1 parent 0bb53e1
commit 5141c38
Showing 1 changed file with 10 additions and 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
@@ -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 {