1.1 restoration

[mir.git] / source / mir / storage / store / ObjectStore.java

diff --git a/source/mir/storage/store/ObjectStore.java b/source/mir/storage/store/ObjectStore.java
index f84206d..0c65b1c 100755 (executable)
--- a/source/mir/storage/store/ObjectStore.java
+++ b/source/mir/storage/store/ObjectStore.java
@@ -18,13 +18,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with  any library licensed under the Apache Software License, 
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library 
- * (or with modified versions of the above that use the same license as the above), 
- * and distribute linked combinations including the two.  You must obey the 
- * GNU General Public License in all respects for all of the code used other than 
- * the above mentioned libraries.  If you modify this file, you may extend this 
- * exception to your version of the file, but you are not obligated to do so.  
+ * the code of this program with  any library licensed under the Apache Software License,
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
+ * (or with modified versions of the above that use the same license as the above),
+ * and distribute linked combinations including the two.  You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries.  If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
  * If you do not wish to do so, delete this exception statement from your version.
  */
 package mir.storage.store;
@@ -59,14 +59,10 @@ package mir.storage.store;
  * @version 1.0
  */
 
-import java.io.BufferedInputStream;
-import java.io.FileInputStream;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.MissingResourceException;
-import java.util.Properties;
-
 import javax.servlet.http.HttpServletRequest;
 
 import mir.config.MirPropertiesConfiguration;
@@ -77,28 +73,12 @@ public class ObjectStore {
   private final static ObjectStore INSTANCE = new ObjectStore();
   private final static Map containerMap = new HashMap(); // StoreContainerType/StoreContainer
   private static long storeHit = 0, storeMiss = 0;
-  private Properties ostoreConf;
+  private MirPropertiesConfiguration configuration;
   private LoggerWrapper logger;
 
   private ObjectStore() {
-    String confName = null;
-
     logger = new LoggerWrapper("Database.ObjectStore");
-    Properties conf = new Properties();
-
-    try {
-      confName =
-          MirPropertiesConfiguration.instance().getString("Home") +
-          "etc/objectstore.properties";
-      conf.load(new BufferedInputStream(new FileInputStream(confName)));
-    }
-    catch (java.io.FileNotFoundException fnfe) {
-      logger.error("could not read config file. not found: " + confName);
-    }
-    catch (Throwable t) {
-      logger.error("could not get config: " + t.getMessage());
-    }
-    ostoreConf = conf;
+    configuration = MirPropertiesConfiguration.instance();
   }
 
   public static ObjectStore getInstance() {
@@ -165,14 +145,11 @@ public class ObjectStore {
   }
 
   /**
-   *  Method:       invalidate(StoreContainerType)
-   *  Description:  serves to invalidate a whole StoreContainer
-   *
-   *  @return
+   * serves to invalidate a whole StoreContainer
    */
   public void invalidate(StoreContainerType stoc_type) {
     if (stoc_type != null) {
-      /** @todo invalidates too much:
+      /*  @todo invalidates too much:
        *  improvement: if instanceof StoreContainerEntity && EntityList
        *  then invalidate only StoreIdentifier matching the right table
        */
@@ -215,9 +192,8 @@ public class ObjectStore {
 
   public String getConfProperty(String name) {
     if (name != null) {
-      String returnValue = "";
       try {
-        return ostoreConf.getProperty(name);
+        return configuration.getString(name);
       }
       catch (MissingResourceException e) {
         logger.error("getConfProperty: " + e.toString());