diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2014-09-15 11:41:39 +0200 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2014-09-15 11:41:39 +0200 |
| commit | 3bb0aefa38c27221114a2db749d2eaa1a9df0336 (patch) | |
| tree | 022a172278d54a35ae464ecd3fc8a19ab6231bf9 /src/main/java/com/c2kernel/process/module | |
| parent | 95b8f12336bbc46f8d3e7cd407b89911aba8d2c5 (diff) | |
Add trim calls to ObjectProperties.getString() to discard any extra
whitespace around the values. Fixes #165
Remove old Gateway.getProperty methods - there should be no deprecated
methods in the 3.0 release
Move all getProperty() calls to getString or other so they will be
trimmed.
Introduce ObjectProperties.getInstances to create ArrayLists of objects
from comma-separated class name lists.
Diffstat (limited to 'src/main/java/com/c2kernel/process/module')
| -rw-r--r-- | src/main/java/com/c2kernel/process/module/ModuleManager.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/com/c2kernel/process/module/ModuleManager.java b/src/main/java/com/c2kernel/process/module/ModuleManager.java index 4fde044..02e7eaa 100644 --- a/src/main/java/com/c2kernel/process/module/ModuleManager.java +++ b/src/main/java/com/c2kernel/process/module/ModuleManager.java @@ -144,7 +144,7 @@ public class ModuleManager { public void registerModules() throws ModuleException {
ItemProxy serverEntity;
try {
- serverEntity = Gateway.getProxyManager().getProxy(new DomainPath("/servers/"+Gateway.getProperties().getProperty("ItemServer.name")));
+ serverEntity = Gateway.getProxyManager().getProxy(new DomainPath("/servers/"+Gateway.getProperties().getString("ItemServer.name")));
} catch (ObjectNotFoundException e) {
throw new ModuleException("Cannot find local server name.");
}
@@ -156,8 +156,7 @@ public class ModuleManager { Logger.msg("Registering module "+thisMod.getName());
try {
- String nsReset = Gateway.getProperties().getProperty("Module."+thisMod.getNamespace()+".reset");
- boolean thisReset = nsReset == null?reset:nsReset.equals("true");
+ boolean thisReset = Gateway.getProperties().getBoolean("Module."+thisMod.getNamespace()+".reset");
thisMod.importAll(serverEntity, user, modulesXML.get(thisMod.getNamespace()), thisReset);
} catch (Exception e) {
Logger.error(e);
|