projects
/
mir.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rebuilding head
[mir.git]
/
source
/
mir
/
storage
/
store
/
StoreContainer.java
diff --git
a/source/mir/storage/store/StoreContainer.java
b/source/mir/storage/store/StoreContainer.java
index
9ad70f7
..
dafe141
100755
(executable)
--- a/
source/mir/storage/store/StoreContainer.java
+++ b/
source/mir/storage/store/StoreContainer.java
@@
-50,8
+50,6
@@
import java.util.ListIterator;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequest;
-import mir.config.MirPropertiesConfiguration;
-import mir.config.MirPropertiesConfiguration.PropertiesConfigExc;
import mir.log.LoggerWrapper;
import mir.misc.StringUtil;
import mir.log.LoggerWrapper;
import mir.misc.StringUtil;
@@
-66,8
+64,7
@@
public class StoreContainer {
private int hitCount = 0, missCount = 0;
private static ObjectStore o_store = ObjectStore.getInstance();
private int hitCount = 0, missCount = 0;
private static ObjectStore o_store = ObjectStore.getInstance();
- protected LoggerWrapper logger = new LoggerWrapper("Database");
- private MirPropertiesConfiguration configuration;
+ protected LoggerWrapper logger = new LoggerWrapper("Database.ObjectStore");
// avoid construction without parameters
private StoreContainer() {};
// avoid construction without parameters
private StoreContainer() {};
@@
-77,14
+74,9
@@
public class StoreContainer {
this.uniqueId = ++uniqueCounter;
this.stocType = stoc_type;
this.container = new LinkedList();
this.uniqueId = ++uniqueCounter;
this.stocType = stoc_type;
this.container = new LinkedList();
- try {
- configuration = MirPropertiesConfiguration.instance();
- } catch (PropertiesConfigExc e) {
- e.printStackTrace(logger.asPrintWriter(LoggerWrapper.ERROR_MESSAGE));
- }
int defaultSize = stoc_type.getDefaultSize();
String confProperty = stoc_type.getConfPrefix() + ".DefaultSize";
int defaultSize = stoc_type.getDefaultSize();
String confProperty = stoc_type.getConfPrefix() + ".DefaultSize";
- String confedSize =
configuration.getString
(confProperty);
+ String confedSize =
o_store.getConfProperty
(confProperty);
if (confedSize != null) {
this.maxSize = StringUtil.parseInt(confedSize, defaultSize);
}
if (confedSize != null) {
this.maxSize = StringUtil.parseInt(confedSize, defaultSize);
}