Changeset 1667 for branches/3.0-Beta2

Timestamp:

06/24/07 14:27:29 (18 months ago)

Author:

jmoore

Message:

Fixing PathUtil to prevent NPEs.

Files:

• branches/3.0-Beta2/components/common/src/ome/util/PathUtil.java (modified) (1 diff)

branches/3.0-Beta2/components/common/src/ome/util/PathUtil.java

@@ -1 +1 @@
 package ome.util;
 
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.Properties;
 
+import ome.conditions.InternalException;
+
+import org.springframework.util.ResourceUtils;
 
 public class PathUtil {
-        
-        private final String SPRING_FILE_PATH = "components/romio/resources/beanRefContext.xml"; 
-        private final String OMERO_PROPS = "etc/omero.properties";
-        private static PathUtil instance = null;
-        private static Properties properties;
-        
-        private PathUtil() {
-                properties = new Properties();
-            try {
-                properties.load(new FileInputStream(OMERO_PROPS));
-            } catch (IOException e) {
-                        // TODO - something
-                }               
-        }
-        
-        public static PathUtil getInstance() {
-                if (instance == null) {
-                        return new PathUtil();
-                } else {
-                        return instance;
-                }
-        }
-        
-        public String getDataFilePath() {
-                String path = properties.getProperty("omero.data.dir");                         
-                return path;
-        }
+
+    private final String SPRING_FILE_PATH = "components/romio/resources/beanRefContext.xml";
+
+    private final String OMERO_PROPS = "classpath:omero.properties";
+
+    private static PathUtil instance = null;
+
+    private static Properties properties;
+
+    private PathUtil() {
+        properties = new Properties();
+        File f = null;
+        FileInputStream fis = null;
+        try {
+            f = ResourceUtils.getFile(OMERO_PROPS);
+            fis = new FileInputStream(f);
+            properties.load(fis);
+        } catch (IOException e) {
+            throw new InternalException("Could not load omero.properties:");
+        } finally {
+            if (fis != null) {
+                try {
+                    fis.close();
+                } catch (Exception e) {
+                    // ok
+                }
+            }
+        }
+    }
+
+    public static PathUtil getInstance() {
+        if (instance == null) {
+            return new PathUtil();
+        } else {
+            return instance;
+        }
+    }
+
+    public String getDataFilePath() {
+        String path = properties.getProperty("omero.data.dir");
+        return path;
+    }
 
 }