From c20cea85ddc36808105468181e646764ade0201f Mon Sep 17 00:00:00 2001
From: mdb <mdb@6335cc39-0255-0410-8fd6-9bcaacd3b74c>
Date: Tue, 10 Jul 2007 22:00:21 +0000
Subject: [PATCH] Allow the prune interval to be run on a particular RunQueue
 (invoker in this case as the Invoker is now a RunQueue) instead of on its own
 interval thread.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@2126 6335cc39-0255-0410-8fd6-9bcaacd3b74c
---
 .../samskivert/servlet/user/UserManager.java   | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/java/com/samskivert/servlet/user/UserManager.java b/src/java/com/samskivert/servlet/user/UserManager.java
index 159bfbba..24897e52 100644
--- a/src/java/com/samskivert/servlet/user/UserManager.java
+++ b/src/java/com/samskivert/servlet/user/UserManager.java
@@ -32,6 +32,7 @@ import com.samskivert.servlet.RedirectException;
 import com.samskivert.servlet.util.CookieUtil;
 import com.samskivert.servlet.util.RequestUtils;
 import com.samskivert.util.Interval;
+import com.samskivert.util.RunQueue;
 import com.samskivert.util.StringUtil;
 import com.samskivert.util.Tuple;
 
@@ -79,7 +80,7 @@ public class UserManager
     }
 
     /**
-     * Prepares this user manager it for operation. Presently the user manager requires the
+     * Prepares this user manager for operation. Presently the user manager requires the
      * following configuration information:
      *
      * <ul>
@@ -101,6 +102,17 @@ public class UserManager
      */
     public void init (Properties config, ConnectionProvider conprov)
         throws PersistenceException
+    {
+        init(config, conprov, null);
+    }
+
+    /**
+     * Prepares this user manager for operation. See {@link #init(Properties,ConnectionProvider)}.
+     *
+     * @param pruneQueue an optional run queue on which to run our periodic session pruning task.
+     */
+    public void init (Properties config, ConnectionProvider conprov, final RunQueue pruneQueue)
+        throws PersistenceException
     {
         // save this for later
         _config = config;
@@ -128,8 +140,8 @@ public class UserManager
 
         // register a cron job to prune the session table every hour
         _pruner = new Interval() {
-            public void expired ()
-            {
+            { _runQueue = pruneQueue; } // blame Ray for being draconian in Interval's constructor
+            public void expired () {
                 try {
                     _repository.pruneSessions();
                 } catch (PersistenceException pe) {