commit a546afc37acffed4428e5481a6aadb0b425c89a1
author Yuta HIGUCHI <y-higuchi@onlab.us> Mon Oct 06 21:44:48 2014 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Mon Oct 06 21:44:48 2014 -0700
tree 5c18e00e14ea754d5256408c959c5ba90da62f9d
parent af797185a56e3225b226e32b1a384866afba1362

Try fixing Timer bug

Change-Id: I044c0f5c8eb9874b4508da216a827c86fdd8b436

core/net/src/test/java/org/onlab/onos/net/host/impl/HostMonitorTest.java

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 14d72eb..d766251 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.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 @@
     }
 
     @Test
-    @Ignore
     public void testMonitorHostDoesNotExist() throws Exception {
         HostManager hostManager = createMock(HostManager.class);
 

utils/misc/src/main/java/org/onlab/util/Timer.java

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 7719fa1..6a3be49 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 @@
 
     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;
         }
     }