From eb89b02143904370926a64e016bbbef43b1e3894 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Fri, 26 Sep 2014 12:11:59 +0200 Subject: Only override Module.reset value if it's actually given for a particular module --- src/main/java/com/c2kernel/process/module/ModuleManager.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/main/java/com/c2kernel') 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); -- cgit v1.2.3