diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2014-02-26 10:29:36 +0100 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2014-02-26 10:29:36 +0100 |
| commit | 755bb76c94953b62a08e9fecf523bc5c42ec79ac (patch) | |
| tree | 63edd567272cd87edd55eeb55a5fc814e1f6079d /src/main/java/com/c2kernel/persistency | |
| parent | 1faab1fd00f70881d4666d766fd0f033e172ff80 (diff) | |
Properties extended as ObjectProperties, which can return any Object,
and wrap int and boolean parsing. Gateway.getProperties() returns the
new ObjectProperty instance. Old Gateway property methods still present
but deprecated. Refs #149
Diffstat (limited to 'src/main/java/com/c2kernel/persistency')
| -rw-r--r-- | src/main/java/com/c2kernel/persistency/ClusterStorageManager.java | 6 | ||||
| -rw-r--r-- | src/main/java/com/c2kernel/persistency/XMLClusterStorage.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/com/c2kernel/persistency/ClusterStorageManager.java b/src/main/java/com/c2kernel/persistency/ClusterStorageManager.java index 6ca5502..402c466 100644 --- a/src/main/java/com/c2kernel/persistency/ClusterStorageManager.java +++ b/src/main/java/com/c2kernel/persistency/ClusterStorageManager.java @@ -40,7 +40,7 @@ public class ClusterStorageManager { * This property is usually process specific, and so should be in the server/client.conf and not the connect file.
*/
public ClusterStorageManager() throws ClusterStorageException {
- Object clusterStorageProp = Gateway.getProperty("ClusterStorage");
+ Object clusterStorageProp = Gateway.getProperties().getObject("ClusterStorage");
if (clusterStorageProp == null || clusterStorageProp.equals("")) {
throw new ClusterStorageException("ClusterStorageManager.init() - no ClusterStorages defined. No persistency!");
}
@@ -236,7 +236,7 @@ public class ClusterStorageManager { if (result != null) { // got it!
// store it in the cache
if (sysKeyMemCache == null) { // create cache if needed
- boolean useWeak = Gateway.getProperty("Storage.useWeakCache","false").equals("true");
+ boolean useWeak = Gateway.getProperties().getBoolean("Storage.useWeakCache", false);
Logger.msg(7,"ClusterStorageManager.put() - Creating "+(useWeak?"Weak":"Strong")+" cache for entity "+sysKeyIntObj);
sysKeyMemCache = useWeak?new WeakCache<String, C2KLocalObject>():new SoftCache<String, C2KLocalObject>(0);
synchronized (memoryCache) {
@@ -276,7 +276,7 @@ public class ClusterStorageManager { if (memoryCache.containsKey(sysKeyIntObj))
sysKeyMemCache = memoryCache.get(sysKeyIntObj);
else {
- boolean useWeak = Gateway.getProperty("Storage.useWeakCache","false").equals("true");
+ boolean useWeak = Gateway.getProperties().getBoolean("Storage.useWeakCache", false);
Logger.msg(7,"ClusterStorageManager.put() - Creating "+(useWeak?"Weak":"Strong")+" cache for entity "+sysKeyIntObj);
sysKeyMemCache = useWeak?new WeakCache<String, C2KLocalObject>():new SoftCache<String, C2KLocalObject>(0);
synchronized (memoryCache) {
diff --git a/src/main/java/com/c2kernel/persistency/XMLClusterStorage.java b/src/main/java/com/c2kernel/persistency/XMLClusterStorage.java index 056fe28..f63dac6 100644 --- a/src/main/java/com/c2kernel/persistency/XMLClusterStorage.java +++ b/src/main/java/com/c2kernel/persistency/XMLClusterStorage.java @@ -18,7 +18,7 @@ public class XMLClusterStorage extends ClusterStorage { @Override
public void open() throws ClusterStorageException {
- String rootProp = Gateway.getProperty("XMLStorage.root");
+ String rootProp = Gateway.getProperties().getProperty("XMLStorage.root");
if (rootProp == null)
throw new ClusterStorageException("XMLClusterStorage.open() - Root path not given in config file.");
|