Mercurial > hg > Database > Alice

changeset 501:c5072a63b257 dispose

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove comment
author sugi
date Tue, 16 Dec 2014 16:03:15 +0900
parents a03d0a570963
children 7d83a188a4f7
files src/main/java/alice/topology/manager/keeparive/RemoveTask.java src/main/java/alice/topology/manager/keeparive/RespondPing.java src/main/java/alice/topology/node/DeleteConnection.java
diffstat 3 files changed, 6 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- 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);
     }
--- 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();
--- 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<String> 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);