Merge pull request #293 from arunvenmany-ibm/sast_issue_fix_1.0

Sast issue fix 1.0
OpenLiberty · Aug 7, 2024 · 45b1937 · 45b1937
2 parents 6d75f15 + 5a7a585
commit 45b1937
Showing 1 changed file with 30 additions and 26 deletions.
diff --git a/liberty-ls/src/main/java/io/openliberty/tools/langserver/utils/XmlReader.java b/liberty-ls/src/main/java/io/openliberty/tools/langserver/utils/XmlReader.java
@@ -61,38 +61,42 @@ public static Map<String, String> getElementValues(File file, Set<String> elemen
 
     private static void readElementValues(File file, Set<String> elementNames, Map<String, String> returnValues) {
         XMLInputFactory factory = getXmlInputFactory();
+        try {
+            readElements(file, elementNames, returnValues, factory);
+        } catch (Exception e) {
+            LOGGER.severe("Unable to access XML file "+ file.getAbsolutePath());
+        }
+    }
+
+    private static void readElements(File file, Set<String> elementNames, Map<String, String> returnValues, XMLInputFactory factory) {
         XMLEventReader reader = null;
         try {
-            try {
-                FileInputStream fis = new FileInputStream(file);
-                reader = factory.createXMLEventReader(fis);
-                while (reader.hasNext()) {
-                    XMLEvent nextEvent = reader.nextEvent();
-                    if (!nextEvent.isStartElement()) {
-                        continue;
-                    }
-                    String elementName = getElementName(nextEvent);
-                    if (elementNames.contains(elementName) && reader.hasNext()) {
-                        XMLEvent elementContent = reader.nextEvent();
-                        if (elementContent.isCharacters()) {
-                            Characters value = elementContent.asCharacters();
-                            returnValues.put(elementName, value.getData());
-                        }
-                    }
+            FileInputStream fis = new FileInputStream(file);
+            reader = factory.createXMLEventReader(fis);
+            while (reader.hasNext()) {
+                XMLEvent nextEvent = reader.nextEvent();
+                if (!nextEvent.isStartElement()) {
+                    continue;
                 }
-            } catch (XMLStreamException | FileNotFoundException e) {
-                LOGGER.severe("Error received trying to read XML file: " + file.getName() +
-                          "\n\tError" + e.getMessage());
-            } finally {
-                if (reader != null) {
-                    try {
-                        reader.close();
-                    } catch (Exception ignored) {
+                String elementName = getElementName(nextEvent);
+                if (elementNames.contains(elementName) && reader.hasNext()) {
+                    XMLEvent elementContent = reader.nextEvent();
+                    if (elementContent.isCharacters()) {
+                        Characters value = elementContent.asCharacters();
+                        returnValues.put(elementName, value.getData());
                     }
                 }
             }
-        } catch (Exception e) {
-            LOGGER.severe("Unable to access XML file "+ file.getAbsolutePath());
+        } catch (XMLStreamException | FileNotFoundException e) {
+            LOGGER.severe("Error received trying to read XML file: " + file.getName() +
+                      "\n\tError" + e.getMessage());
+        } finally {
+            if (reader != null) {
+                try {
+                    reader.close();
+                } catch (Exception ignored) {
+                }
+            }
         }
     }