changeset 479:1550cb8429df dispose

bug fix (keep alive)
author sugi
date Fri, 05 Dec 2014 02:36:17 +0900
parents cf345b10a21a
children c06070403ed4
files src/main/java/alice/topology/manager/keeparive/ListManager.java
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/alice/topology/manager/keeparive/ListManager.java	Tue Dec 02 17:16:34 2014 +0900
+++ b/src/main/java/alice/topology/manager/keeparive/ListManager.java	Fri Dec 05 02:36:17 2014 +0900
@@ -29,7 +29,7 @@
                 add(newInfo);
             }
         }
-        //show(); need debug option
+        //show(); //need debug option
     }
 
     private void add(TaskInfo newInfo){
@@ -55,11 +55,11 @@
         boolean matchFlag = false;
         int cnt = 0;
         for (TaskInfo t: list){
-            if (t.getType().equals(task.getType())){
+            if (t.getType().equals(task.getType())&&t.getManagerKey().equals(task.getManagerKey())){
                 matchFlag = true;
                 if (cnt+1 < list.size() ){ // next task exists.
                     TaskInfo next = list.get(cnt+1);
-                    next.setSleepTime(next.getSleepTime()+task.getSleepTime());
+                    next.setSleepTime(next.getSleepTime()+t.getSleepTime());
                 }
                 list.remove(cnt);
                 break;
@@ -74,11 +74,11 @@
         TaskInfo nowTask = TaskExecuter.getInstance().getNowTask();
         if (nowTask!=null){
             System.out.print("NOW | ");
-            System.out.print(nowTask.getSleepTime());
+            System.out.print(nowTask.getSleepTime() +" "+nowTask.getType()+" "+nowTask.getManagerKey());
             System.out.print(" | ");
         }
         for (TaskInfo info : list){
-            System.out.print(info.getSleepTime());
+            System.out.print(info.getSleepTime() +" "+ info.getType()+" "+info.getManagerKey());
             System.out.print(" | ");
         }
         System.out.println();