# HG changeset patch # User sugi # Date 1418713395 -32400 # Node ID c5072a63b2574efb2d2289b581eb4747bf7e8031 # Parent a03d0a57096356bc8be543958e8c279749deaa51 remove comment diff -r a03d0a570963 -r c5072a63b257 src/main/java/alice/topology/manager/keeparive/RemoveTask.java --- a/src/main/java/alice/topology/manager/keeparive/RemoveTask.java Mon Dec 15 20:20:01 2014 +0900 +++ b/src/main/java/alice/topology/manager/keeparive/RemoveTask.java Tue Dec 16 16:03:15 2014 +0900 @@ -22,15 +22,8 @@ // case: remove task is still in the waiting queue. boolean removeFlag = list.deleteTask(task); if (!removeFlag){ - System.out.println("falied RemoveTask "+task.getManagerKey()); ods.put("_REMOVETASK", task); - } else { - System.out.println("success RemoveTask "+task.getManagerKey()); - //list.show(); } - } else { - System.out.println("success RemoveTask "+task.getManagerKey()); - //list.show(); } ods.update("_WAITINGLIST", list); } diff -r a03d0a570963 -r c5072a63b257 src/main/java/alice/topology/manager/keeparive/RespondPing.java --- a/src/main/java/alice/topology/manager/keeparive/RespondPing.java Mon Dec 15 20:20:01 2014 +0900 +++ b/src/main/java/alice/topology/manager/keeparive/RespondPing.java Tue Dec 16 16:03:15 2014 +0900 @@ -10,7 +10,6 @@ public RespondPing(String key) { respond.setKey(key); - this.setPriority(10); } @Override @@ -18,13 +17,12 @@ TaskExecuter exec = TaskExecuter.getInstance(); synchronized (exec){ RespondData d = respond.asClass(RespondData.class); -// System.out.print("ping from "+d.from); -// System.out.println(" Recieved time "+(d.time - pingedTime)); + //System.out.print("ping from "+d.from); + //System.out.println(" Recieved time "+(d.time - pingedTime)); TaskInfo task = new TaskInfo(TaskType.CLOSE); task.setInfo(d.from, null, 0); if (!exec.compareAndSkip(task)){ - System.out.println("falied RespondPing"); // case: remove task is still in the waiting queue. ods.put("_REMOVETASK",task); new RemoveTask(); diff -r a03d0a570963 -r c5072a63b257 src/main/java/alice/topology/node/DeleteConnection.java --- a/src/main/java/alice/topology/node/DeleteConnection.java Mon Dec 15 20:20:01 2014 +0900 +++ b/src/main/java/alice/topology/node/DeleteConnection.java Tue Dec 16 16:03:15 2014 +0900 @@ -24,10 +24,11 @@ @SuppressWarnings("unchecked") List list = info.asClass(List.class); - if (list.contains(name)) { + if (list.contains(name)) list.remove(name); - if (DataSegment.contains(name)) - DataSegment.get(name).shutdown(); + if (DataSegment.contains(name)) { + DataSegment.get(name).shutdown(); + DataSegment.remove(name); } ListManager manager = info1.asClass(ListManager.class); manager.deleteAll(name);