Commit 144d9a5a authored by afreyssin's avatar afreyssin
Browse files

Adds setDefaultConfig method.

Fixes a bug in default configuration handling (user configuration was overloaded during initialization).
parent 6c9ada6b
......@@ -270,6 +270,10 @@ public final class AgentServer {
defaultConfig = strbuf.toString();
}
public static void setDefaultConfig(String config) {
defaultConfig = config;
}
private static short serverId = NULL_ID;
private static Logger logmon = null;
......@@ -1089,7 +1093,8 @@ public final class AgentServer {
logmon.log(BasicLevel.WARN, getName() + ", init()");
// Fix a Joram configuration as default.
setDefaultConfig(sid);
if (defaultConfig == null)
setDefaultConfig(sid);
synchronized(status) {
if (status.value == Status.STOPPED) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment