홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Yuta HIGUCHI
a546afc3 1 parent af797185

Try fixing Timer bug 

Change-Id: I044c0f5c8eb9874b4508da216a827c86fdd8b436
Inline Side-by-side
Showing 2 changed files with 3 additions and 4 deletions
...@@ -13,7 +13,6 @@ import java.util.Collections; ...@@ -13,7 +13,6 @@ import java.util.Collections;
13 import java.util.List; 13 import java.util.List;
14 import java.util.Set; 14 import java.util.Set;
15 15
16 -import org.junit.Ignore;
17 import org.junit.Test; 16 import org.junit.Test;
18 import org.onlab.onos.net.ConnectPoint; 17 import org.onlab.onos.net.ConnectPoint;
19 import org.onlab.onos.net.Device; 18 import org.onlab.onos.net.Device;
...@@ -82,7 +81,6 @@ public class HostMonitorTest { ...@@ -82,7 +81,6 @@ public class HostMonitorTest {
82 } 81 }
83 82
84 @Test 83 @Test
85 - @Ignore
86 public void testMonitorHostDoesNotExist() throws Exception { 84 public void testMonitorHostDoesNotExist() throws Exception {
87 HostManager hostManager = createMock(HostManager.class); 85 HostManager hostManager = createMock(HostManager.class);
88 86
......
...@@ -28,8 +28,9 @@ public final class Timer { ...@@ -28,8 +28,9 @@ public final class Timer {
28 28
29 private static synchronized void initTimer() { 29 private static synchronized void initTimer() {
30 if (Timer.timer == null) { 30 if (Timer.timer == null) {
31 - Timer.timer = new HashedWheelTimer(); 31 + HashedWheelTimer hwTimer = new HashedWheelTimer();
32 - Timer.timer.start(); 32 + hwTimer.start();
33 + Timer.timer = hwTimer;
33 } 34 }
34 } 35 }
35 36
......