Merge pull request #100 from cherylking/embeddedServerFix

Fix embedded server to handle null outputDir and userDir and add testing with 19.0.0.6
OpenLiberty · Jun 28, 2019 · 8837b9d · 8837b9d
2 parents 0bb53e1 + bb92a82
commit 8837b9d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,11 +7,7 @@ jdk:
     - oraclejdk9
     - oraclejdk11
 env:
-    - WLP_VERSION=18.0.0_04 WLP_LICENSE=L-CTUR-B4WNHE
     - WLP_VERSION=19.0.0_03 WLP_LICENSE=L-CTUR-B9JQES
-matrix:
-    exclude:
-    - jdk: oraclejdk11
-      env: WLP_VERSION=18.0.0_04 WLP_LICENSE=L-CTUR-B4WNHE
+    - WLP_VERSION=19.0.0_06 WLP_LICENSE=L-CTUR-BCTPHF
 script:
 - travis_wait mvn verify -Ponline-its -Dinvoker.streamLogs=true -DwlpVersion=$WLP_VERSION -DwlpLicense=$WLP_LICENSE -e
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,11 +1,11 @@
 environment:
     matrix:
-        - jdk: "C:\\Program Files\\Java\\jdk1.8.0\\bin:"
-          WLP_VERSION: 18.0.0_04
-          WLP_LICENSE: L-CTUR-B4WNHE
         - jdk: "C:\\Program Files\\Java\\jdk1.8.0\\bin:"
           WLP_VERSION: 19.0.0_03
           WLP_LICENSE: L-CTUR-B9JQES
+        - jdk: "C:\\Program Files\\Java\\jdk1.8.0\\bin:"
+          WLP_VERSION: 19.0.0_06
+          WLP_LICENSE: L-CTUR-BCTPHF
 
 install:
     - cmd: |

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 {