Merge lp:~lsinger/play/1.1 into lp:play/1.1

[Leif Singer]

[Leif Singer (lsinger)]

Fixes bug #501665 - Controller.suspend doesn't allow subsecond suspend times.

[lp:~lsinger/play/1.1]

721. By guillaume <guillaume@gbo-mac> on 2009-12-30

Merge 1.0

[Guillaume Bort (guillaume-bort)]

Ok merged. Another cool feature we could provide in this room is:

protected static void waitFor(Future tasks...) {
}

It could wait for several tasks completions before resuming the request.

[lp:~lsinger/play/1.1]

722. By guillaume <guillaume@gbo-mac> on 2009-12-30

Merge

[Leif Singer (lsinger)]

> Ok merged. Another cool feature we could provide in this room is:
>
> protected static void waitFor(Future tasks...) {
> }
>
> It could wait for several tasks completions before resuming the request.

Thanks a lot for merging so quickly! It's nice to have own code in my favorite server-side framework. :)

As for the waitFor for multiple Futures: it looks like it would be useful for some, but then again, I've actually never worked with Futures, so I couldn't even tell whether it works correctly. So I guess I should leave that one to you to decide.

Regards
  Leif

=== modified file 'framework/src/play/Invoker.java'
--- framework/src/play/Invoker.java	2009-11-17 12:59:06 +0000
+++ framework/src/play/Invoker.java	2009-12-30 15:53:13 +0000
@@ -40,13 +40,13 @@
     /**
      * Run the code in a new thread after a delay
      * @param invocation The code to run
-     * @param seconds The time to wait before
+     * @param millis The time to wait before, in milliseconds
      * @return The future object, to know when the task is completed
      */
-    public static Future invoke(final Invocation invocation, int seconds) {
+    public static Future invoke(final Invocation invocation, long millis) {
         Monitor monitor = MonitorFactory.getMonitor("Invocation queue", "elmts.");
         monitor.add(executor.getQueue().size());
-        return executor.schedule(invocation, seconds, TimeUnit.SECONDS);
+        return executor.schedule(invocation, millis, TimeUnit.MILLISECONDS);
     }
 
     /**
@@ -64,7 +64,7 @@
                     if (invocation.retry.task != null) {
                         invocation.retry.task.get();
                     } else {
-                        Thread.sleep(invocation.retry.timeout * 1000);
+                        Thread.sleep(invocation.retry.timeout);
                     }
                 } catch (Exception e) {
                     throw new UnexpectedException(e);
@@ -219,16 +219,16 @@
     public static class Suspend extends PlayException {
 
         /**
-         * Suspend for a timeout (in seconds).
+         * Suspend for a timeout (in milliseconds).
          */
-        int timeout;
+        long timeout;
         
         /**
          * Wait for task execution.
          */
         Future task;
 
-        public Suspend(int timeout) {
+        public Suspend(long timeout) {
             this.timeout = timeout;
         }
 
@@ -246,7 +246,7 @@
             if (task != null) {
                 return "Wait for " + task;
             }
-            return "Retry in " + timeout + " s.";
+            return "Retry in " + timeout + " ms.";
         }
     }
 

=== modified file 'framework/src/play/mvc/Controller.java'
--- framework/src/play/mvc/Controller.java	2009-11-22 18:32:54 +0000
+++ framework/src/play/mvc/Controller.java	2009-12-30 15:53:14 +0000
@@ -540,8 +540,15 @@
      * Suspend the current request for a specified amount of time
      */
     protected static void suspend(String timeout) {
+    	suspend(1000 * Time.parseDuration(timeout));
+    }
+
+    /**
+     * Suspend the current request for a specified amount of time (in milliseconds)
+     */
+    protected static void suspend(int millis) {
         Request.current().isNew = false;
-        throw new Suspend(Time.parseDuration(timeout));
+        throw new Suspend(millis);
     }
 
     /**