# HG changeset patch # User Nozomi Teruya # Date 1450370052 -32400 # Node ID 2aac0644f92d536424055895d4a1daa821ae2ccd # Parent 26033ebb30ecbe3ff7af3b05f19eb4a47c05bd4b change TopologyNodeConfig constractor diff -r 26033ebb30ec -r 2aac0644f92d src/main/java/alice/daemon/Config.java --- a/src/main/java/alice/daemon/Config.java Fri Dec 18 00:30:41 2015 +0900 +++ b/src/main/java/alice/daemon/Config.java Fri Dec 18 01:34:12 2015 +0900 @@ -22,39 +22,37 @@ public LinkedList setConfig(int i, String []args){ configArgs = new LinkedList(); - if (configArgs.isEmpty()){ - if ("-p".equals(args[i])) { - localPort = Integer.parseInt(args[++i]); - configArgs.add("-p"); - configArgs.add(args[i]); - } else if ("-log".equals(args[i])) { - logFile = args[++i]; - configArgs.add("-log"); - configArgs.add(args[i]); - } else if ("-n".equals(args[i])) { - nis = args[++i]; - configArgs.add("-n"); - configArgs.add(args[i]); - } else if ("-a".equals(args[i])) { - MCSTADDR = args[++i]; - configArgs.add("-a"); - configArgs.add(args[i]); - } else if ("-level".equals(args[i])) { - String levelStr = args[++i]; - if (levelStr.equals("fatal")) { - level = Level.FATAL; - } else if (levelStr.equals("error")) { - level = Level.ERROR; - } else if (levelStr.equals("warn")) { - level = Level.WARN; - } else if (levelStr.equals("info")) { - level = Level.INFO; - } else if (levelStr.equals("debug")) { - level = Level.DEBUG; - } - configArgs.add("-level"); - configArgs.add(args[i]); + if ("-p".equals(args[i])) { + localPort = Integer.parseInt(args[++i]); + configArgs.add("-p"); + configArgs.add(args[i]); + } else if ("-log".equals(args[i])) { + logFile = args[++i]; + configArgs.add("-log"); + configArgs.add(args[i]); + } else if ("-n".equals(args[i])) { + nis = args[++i]; + configArgs.add("-n"); + configArgs.add(args[i]); + } else if ("-a".equals(args[i])) { + MCSTADDR = args[++i]; + configArgs.add("-a"); + configArgs.add(args[i]); + } else if ("-level".equals(args[i])) { + String levelStr = args[++i]; + if (levelStr.equals("fatal")) { + level = Level.FATAL; + } else if (levelStr.equals("error")) { + level = Level.ERROR; + } else if (levelStr.equals("warn")) { + level = Level.WARN; + } else if (levelStr.equals("info")) { + level = Level.INFO; + } else if (levelStr.equals("debug")) { + level = Level.DEBUG; } + configArgs.add("-level"); + configArgs.add(args[i]); } return configArgs; diff -r 26033ebb30ec -r 2aac0644f92d src/main/java/alice/topology/node/TopologyNodeConfig.java --- a/src/main/java/alice/topology/node/TopologyNodeConfig.java Fri Dec 18 00:30:41 2015 +0900 +++ b/src/main/java/alice/topology/node/TopologyNodeConfig.java Fri Dec 18 01:34:12 2015 +0900 @@ -14,7 +14,7 @@ private ArrayList eventList = new ArrayList(); public TopologyNodeConfig() { - super(null); + super(new String[]{}); } public TopologyNodeConfig(String[] args) { super(args);