From f1bbf2093eb8a3f54eaead3860ab7dd628fd3be1 Mon Sep 17 00:00:00 2001
From: Evie Lau <evie@us.ibm.com>
Date: Wed, 25 Oct 2023 14:32:30 -0500
Subject: [PATCH] Remove unnecessary null check

---
 .../plugins/config/ServerConfigDocument.java  | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/main/java/io/openliberty/tools/common/plugins/config/ServerConfigDocument.java b/src/main/java/io/openliberty/tools/common/plugins/config/ServerConfigDocument.java
index c1603968..340c9358 100644
--- a/src/main/java/io/openliberty/tools/common/plugins/config/ServerConfigDocument.java
+++ b/src/main/java/io/openliberty/tools/common/plugins/config/ServerConfigDocument.java
@@ -371,13 +371,11 @@ private static void parseInclude(Document doc) throws XPathExpressionException,
 
                 ArrayList<Document> inclDocs = getIncludeDoc(includeFileName);
                 for (Document inclDoc : inclDocs) {
-                    if (inclDoc != null) {
-                        parseApplication(inclDoc, XPATH_SERVER_APPLICATION);
-                        parseApplication(inclDoc, XPATH_SERVER_WEB_APPLICATION);
-                        parseApplication(inclDoc, XPATH_SERVER_ENTERPRISE_APPLICATION);
-                        // handle nested include elements
-                        parseInclude(inclDoc);
-                    }
+                    parseApplication(inclDoc, XPATH_SERVER_APPLICATION);
+                    parseApplication(inclDoc, XPATH_SERVER_WEB_APPLICATION);
+                    parseApplication(inclDoc, XPATH_SERVER_ENTERPRISE_APPLICATION);
+                    // handle nested include elements
+                    parseInclude(inclDoc);
                 }
             }
         }
@@ -622,11 +620,9 @@ private static void parseIncludeVariables(Document doc) throws XPathExpressionEx
                 ArrayList<Document> inclDocs = getIncludeDoc(includeFileName);
 
                 for (Document inclDoc : inclDocs) {
-                    if (inclDoc != null) {
-                        parseVariablesForBothValues(inclDoc);
-                        // handle nested include elements
-                        parseIncludeVariables(inclDoc);
-                    }
+                    parseVariablesForBothValues(inclDoc);
+                    // handle nested include elements
+                    parseIncludeVariables(inclDoc);
                 }
             }
         }