diff --git a/core/net/src/test/java/org/onlab/onos/net/host/impl/HostMonitorTest.java b/core/net/src/test/java/org/onlab/onos/net/host/impl/HostMonitorTest.java index 14d72eb3f7..d766251b53 100644 --- a/core/net/src/test/java/org/onlab/onos/net/host/impl/HostMonitorTest.java +++ b/core/net/src/test/java/org/onlab/onos/net/host/impl/HostMonitorTest.java @@ -13,7 +13,6 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import org.junit.Ignore; import org.junit.Test; import org.onlab.onos.net.ConnectPoint; import org.onlab.onos.net.Device; @@ -82,7 +81,6 @@ public class HostMonitorTest { } @Test - @Ignore public void testMonitorHostDoesNotExist() throws Exception { HostManager hostManager = createMock(HostManager.class); diff --git a/utils/misc/src/main/java/org/onlab/util/Timer.java b/utils/misc/src/main/java/org/onlab/util/Timer.java index 7719fa14ac..6a3be491f4 100644 --- a/utils/misc/src/main/java/org/onlab/util/Timer.java +++ b/utils/misc/src/main/java/org/onlab/util/Timer.java @@ -28,8 +28,9 @@ public final class Timer { private static synchronized void initTimer() { if (Timer.timer == null) { - Timer.timer = new HashedWheelTimer(); - Timer.timer.start(); + HashedWheelTimer hwTimer = new HashedWheelTimer(); + hwTimer.start(); + Timer.timer = hwTimer; } }