From 25bd57379ddd32485f67137ef521d93ca05a42bc Mon Sep 17 00:00:00 2001
From: Ignasi Barrera <ignasi.barrera@abiquo.com>
Date: Wed, 24 Oct 2012 18:16:06 +0200
Subject: [PATCH] Use the TimeUnit parameter in async monitor

---
 .../internal/BaseMonitoringService.java       |  6 ++---
 .../abiquo/internal/AsyncMonitorTest.java     | 24 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/labs/abiquo/src/main/java/org/jclouds/abiquo/internal/BaseMonitoringService.java b/labs/abiquo/src/main/java/org/jclouds/abiquo/internal/BaseMonitoringService.java
index e54f2d4d0e..cacbf69372 100644
--- a/labs/abiquo/src/main/java/org/jclouds/abiquo/internal/BaseMonitoringService.java
+++ b/labs/abiquo/src/main/java/org/jclouds/abiquo/internal/BaseMonitoringService.java
@@ -131,7 +131,7 @@ public class BaseMonitoringService implements MonitoringService {
       if (objects != null && objects.length > 0) {
          for (T object : objects) {
             AsyncMonitor<T> monitor = new AsyncMonitor<T>(object, completeCondition);
-            monitor.startMonitoring(maxWait);
+            monitor.startMonitoring(maxWait, timeUnit);
          }
       }
    }
@@ -208,9 +208,9 @@ public class BaseMonitoringService implements MonitoringService {
        * @param maxWait
        *           The timeout.
        */
-      public void startMonitoring(final Long maxWait) {
+      public void startMonitoring(final Long maxWait, TimeUnit timeUnit) {
          future = scheduler.scheduleWithFixedDelay(this, 0L, pollingDelay, TimeUnit.MILLISECONDS);
-         timeout = maxWait == null ? null : System.currentTimeMillis() + maxWait;
+         timeout = maxWait == null ? null : System.currentTimeMillis() + timeUnit.toMillis(maxWait);
          logger.debug("started monitor job for %s with %s timeout", monitoredObject,
                timeout == null ? "no" : String.valueOf(timeout));
       }
diff --git a/labs/abiquo/src/test/java/org/jclouds/abiquo/internal/AsyncMonitorTest.java b/labs/abiquo/src/test/java/org/jclouds/abiquo/internal/AsyncMonitorTest.java
index b765fd0375..e3d3cea08d 100644
--- a/labs/abiquo/src/test/java/org/jclouds/abiquo/internal/AsyncMonitorTest.java
+++ b/labs/abiquo/src/test/java/org/jclouds/abiquo/internal/AsyncMonitorTest.java
@@ -69,7 +69,7 @@ public class AsyncMonitorTest {
       assertNull(monitor.getFuture());
       assertNull(monitor.getTimeout());
 
-      monitor.startMonitoring(null);
+      monitor.startMonitoring(null, TimeUnit.MILLISECONDS);
 
       assertNotNull(monitor.getFuture());
       assertNull(monitor.getTimeout());
@@ -95,7 +95,7 @@ public class AsyncMonitorTest {
       assertNull(monitor.getFuture());
       assertNull(monitor.getTimeout());
 
-      monitor.startMonitoring(100L);
+      monitor.startMonitoring(100L, TimeUnit.MILLISECONDS);
 
       assertNotNull(monitor.getFuture());
       assertNotNull(monitor.getTimeout());
@@ -122,7 +122,7 @@ public class AsyncMonitorTest {
       assertNull(monitor.getFuture());
       assertNull(monitor.getTimeout());
 
-      monitor.startMonitoring(null);
+      monitor.startMonitoring(null, TimeUnit.MILLISECONDS);
       assertNotNull(monitor.getFuture());
       assertNull(monitor.getTimeout());
       assertFalse(monitor.isTimeout());
@@ -148,7 +148,7 @@ public class AsyncMonitorTest {
       assertNull(monitor.getFuture());
       assertNull(monitor.getTimeout());
 
-      monitor.startMonitoring(60000L);
+      monitor.startMonitoring(60000L, TimeUnit.MILLISECONDS);
       assertNotNull(monitor.getFuture());
       assertNotNull(monitor.getTimeout());
       assertFalse(monitor.isTimeout());
@@ -174,7 +174,7 @@ public class AsyncMonitorTest {
       assertNull(monitor.getFuture());
       assertNull(monitor.getTimeout());
 
-      monitor.startMonitoring(1L);
+      monitor.startMonitoring(1L, TimeUnit.MILLISECONDS);
       Thread.sleep(2L);
       assertNotNull(monitor.getFuture());
       assertNotNull(monitor.getTimeout());
@@ -203,7 +203,7 @@ public class AsyncMonitorTest {
       assertNull(monitor.getFuture());
       assertNull(monitor.getTimeout());
 
-      monitor.startMonitoring(null);
+      monitor.startMonitoring(null, TimeUnit.MILLISECONDS);
       assertNotNull(monitor.getFuture());
       assertNull(monitor.getTimeout());
 
@@ -233,7 +233,7 @@ public class AsyncMonitorTest {
       assertNull(monitor.getFuture());
       assertNull(monitor.getTimeout());
 
-      monitor.startMonitoring(null);
+      monitor.startMonitoring(null, TimeUnit.MILLISECONDS);
       assertNotNull(monitor.getFuture());
       assertNull(monitor.getTimeout());
 
@@ -264,7 +264,7 @@ public class AsyncMonitorTest {
       assertNull(monitor.getFuture());
       assertNull(monitor.getTimeout());
 
-      monitor.startMonitoring(null);
+      monitor.startMonitoring(null, TimeUnit.MILLISECONDS);
       assertNotNull(monitor.getFuture());
       assertNull(monitor.getTimeout());
 
@@ -297,7 +297,7 @@ public class AsyncMonitorTest {
       assertNull(monitor.getFuture());
       assertNull(monitor.getTimeout());
 
-      monitor.startMonitoring(null);
+      monitor.startMonitoring(null, TimeUnit.MILLISECONDS);
       assertNotNull(monitor.getFuture());
       assertNull(monitor.getTimeout());
 
@@ -333,7 +333,7 @@ public class AsyncMonitorTest {
       assertNull(monitor.getFuture());
       assertNull(monitor.getTimeout());
 
-      monitor.startMonitoring(null);
+      monitor.startMonitoring(null, TimeUnit.MILLISECONDS);
       assertNotNull(monitor.getFuture());
       assertNull(monitor.getTimeout());
 
@@ -367,7 +367,7 @@ public class AsyncMonitorTest {
       assertNull(monitor.getFuture());
       assertNull(monitor.getTimeout());
 
-      monitor.startMonitoring(null);
+      monitor.startMonitoring(null, TimeUnit.MILLISECONDS);
       assertNotNull(monitor.getFuture());
       assertNull(monitor.getTimeout());
 
@@ -403,7 +403,7 @@ public class AsyncMonitorTest {
       assertNull(monitor.getFuture());
       assertNull(monitor.getTimeout());
 
-      monitor.startMonitoring(1L);
+      monitor.startMonitoring(1L, TimeUnit.MILLISECONDS);
       assertNotNull(monitor.getFuture());
       assertNotNull(monitor.getTimeout());