Parvathy | BAH-3720 | Fix. applicationDataDirectory File Path

Bahmni · Mar 29, 2024 · 1ba857f · 1ba857f
1 parent 7408af9
commit 1ba857f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/...api/src/main/java/org/bahmni/module/bahmnicore/dao/impl/ApplicationDataDirectoryImpl.java b/...api/src/main/java/org/bahmni/module/bahmnicore/dao/impl/ApplicationDataDirectoryImpl.java
@@ -9,7 +9,11 @@ public class ApplicationDataDirectoryImpl implements ApplicationDataDirectory {
 
     @Override
     public File getFile(String relativePath) {
-        return new File(OpenmrsUtil.getApplicationDataDirectory() + relativePath);
+        String applicationDataDirectory = OpenmrsUtil.getApplicationDataDirectory();
+        if (!applicationDataDirectory.endsWith(File.separator)) {
+            applicationDataDirectory += File.separator;
+        }
+        return new File(applicationDataDirectory + relativePath);
     }
 
     @Override

diff --git a/...in/java/org/bahmni/module/elisatomfeedclient/api/worker/OpenElisAccessionEventWorker.java b/...in/java/org/bahmni/module/elisatomfeedclient/api/worker/OpenElisAccessionEventWorker.java
@@ -143,7 +143,11 @@ public void process(Event event) {
 
     void runInterceptor(Class className, Object object) {
         GroovyClassLoader gcl = new GroovyClassLoader();
-        File directory = new File(OpenmrsUtil.getApplicationDataDirectory() + "elisFeedInterceptor");
+        String applicationDataDirectory = OpenmrsUtil.getApplicationDataDirectory();
+        if (!applicationDataDirectory.endsWith(File.separator)) {
+            applicationDataDirectory += File.separator;
+        }
+        File directory = new File(applicationDataDirectory + "elisFeedInterceptor");
         File[] files = directory.listFiles();
         if (files != null) {
             for (File file : files) {