diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2014-09-26 12:11:59 +0200 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2014-09-26 12:11:59 +0200 |
| commit | eb89b02143904370926a64e016bbbef43b1e3894 (patch) | |
| tree | 1a4a2b41419d6934a1e41d7571452777669f6859 /src/main/java/com/c2kernel/process/module/ModuleManager.java | |
| parent | 6dec6cbde1d93af253eda10238574c5169cc3cef (diff) | |
Only override Module.reset value if it's actually given for a particular
module
Diffstat (limited to 'src/main/java/com/c2kernel/process/module/ModuleManager.java')
| -rw-r--r-- | src/main/java/com/c2kernel/process/module/ModuleManager.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/com/c2kernel/process/module/ModuleManager.java b/src/main/java/com/c2kernel/process/module/ModuleManager.java index 02e7eaa..c96fa38 100644 --- a/src/main/java/com/c2kernel/process/module/ModuleManager.java +++ b/src/main/java/com/c2kernel/process/module/ModuleManager.java @@ -156,7 +156,10 @@ public class ModuleManager { Logger.msg("Registering module "+thisMod.getName());
try {
- boolean thisReset = Gateway.getProperties().getBoolean("Module."+thisMod.getNamespace()+".reset");
+ String thisResetKey = "Module."+thisMod.getNamespace()+".reset";
+ boolean thisReset = reset;
+ if (Gateway.getProperties().containsKey(thisResetKey))
+ thisReset = Gateway.getProperties().getBoolean(thisResetKey);
thisMod.importAll(serverEntity, user, modulesXML.get(thisMod.getNamespace()), thisReset);
} catch (Exception e) {
Logger.error(e);
|