[airavata] branch develop updated: Giving higher priority for files in config dir

[di...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dimuthuupe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/develop by this push:
     new 91f4fef  Giving higher priority for files in config dir
91f4fef is described below

commit 91f4fef39c34652401e2ff3c2e34842ac6b352a7
Author: dimuthu <di...@gmail.com>
AuthorDate: Mon Mar 26 17:13:20 2018 -0400

    Giving higher priority for files in config dir
---
 .../airavata/common/utils/ApplicationSettings.java | 25 ++++++++++++++--------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
index bbf5102..036d6bf 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
@@ -461,17 +461,24 @@ public class ApplicationSettings {
     }
 
     public static URL loadFile(String fileName) {
-        final URL resource = ApplicationSettings.class.getClassLoader().getResource(fileName);
-        if(resource == null) {
-            if(System.getProperty(AIRAVATA_CONFIG_DIR) != null) {
-                final String airavataConfigDir = System.getProperty(AIRAVATA_CONFIG_DIR);
-                try {
-                     return new File(airavataConfigDir + File.separator + fileName).toURI().toURL();
-                } catch (MalformedURLException e) {
-                    logger.error("Error parsing the file from airavata.config.dir", airavataConfigDir);
+
+        if(System.getProperty(AIRAVATA_CONFIG_DIR) != null) {
+            String airavataConfigDir = System.getProperty(AIRAVATA_CONFIG_DIR);
+            try {
+                airavataConfigDir = airavataConfigDir.endsWith(File.separator) ? airavataConfigDir : airavataConfigDir + File.separator;
+                String filePath = airavataConfigDir + fileName;
+
+                File asfile  = new File(filePath);
+                if (asfile.exists()) {
+
+                    return asfile.toURI().toURL();
                 }
+            } catch (MalformedURLException e) {
+                logger.error("Error parsing the file from airavata.config.dir", airavataConfigDir);
             }
         }
-        return resource;
+
+        return ApplicationSettings.class.getClassLoader().getResource(fileName);
+
     }
 }

-- 
To stop receiving notification emails like this one, please contact
dimuthuupe@apache.org.