From a88f423864006fbb64c2d666f67578cc2dae33a2 Mon Sep 17 00:00:00 2001
From: gkolokythas <gkolokythas@cite.gr>
Date: Wed, 15 Jan 2020 14:09:32 +0200
Subject: [PATCH] Refactors file parsing on Config loader function.

---
 .../logic/proxy/config/configloaders/DevelConfigLoader.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/DevelConfigLoader.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/DevelConfigLoader.java
index d2b4b82cc..72769662b 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/DevelConfigLoader.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/DevelConfigLoader.java
@@ -24,7 +24,6 @@ import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 import java.io.*;
-import java.net.URL;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -172,13 +171,12 @@ public class DevelConfigLoader implements ConfigLoader {
         InputStream is = null;
         Document doc;
         try {
-            String current = new java.io.File(".").getCanonicalPath();
-            is = new URL("file:///" + current + filePath).openStream();
+            is = getClass().getClassLoader().getResource(filePath).openStream();
             DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
             DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
             doc = documentBuilder.parse(is);
             return doc;
-        } catch (IOException | ParserConfigurationException | SAXException e) {
+        } catch (IOException | ParserConfigurationException | SAXException | NullPointerException e) {
             e.printStackTrace();
         } finally {
             try {