From 139e900b442a736e283e571c56b5f65ce4e6fc0d Mon Sep 17 00:00:00 2001
From: Mike Thomas <mthomas@threerings.net>
Date: Tue, 17 Mar 2009 18:04:31 +0000
Subject: [PATCH] We cannot initialize these intervals until the init()
 function, otherwise _omgr is null and we end up getting things called on the
 wrong thread.

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@805 c613c5cb-e716-0410-b11b-feb51c14d237
---
 .../server/TrickCardGameManagerDelegate.java  | 39 ++++++++++++-------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameManagerDelegate.java b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameManagerDelegate.java
index 01d8823c..4f4fe2a2 100644
--- a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameManagerDelegate.java
+++ b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameManagerDelegate.java
@@ -32,10 +32,13 @@ import com.threerings.util.Name;
 
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.dobj.DObject;
+import com.threerings.presents.dobj.RootDObjectManager;
+import com.threerings.presents.server.InvocationManager;
 
 import com.threerings.crowd.data.BodyObject;
 import com.threerings.crowd.data.PlaceConfig;
 import com.threerings.crowd.data.PlaceObject;
+import com.threerings.crowd.server.PlaceManager;
 
 import com.threerings.parlor.card.data.Card;
 import com.threerings.parlor.card.data.CardGameObject;
@@ -65,6 +68,27 @@ public class TrickCardGameManagerDelegate extends TurnGameManagerDelegate
     {
     }
 
+    @Override
+    public void init (PlaceManager plmgr, RootDObjectManager omgr, InvocationManager invmgr)
+    {
+        super.init(plmgr, omgr, invmgr);
+
+        // Create these intervals HERE after the _omgr is actually initialized.
+        _turnTimeoutInterval = new Interval(_omgr) {
+            @Override
+            public void expired () {
+                _turnTimedOut = true;
+                turnTimedOut();
+            }
+        };
+        _endTrickInterval = new Interval(_omgr) {
+            @Override
+            public void expired () {
+                endTrick();
+            }
+        };
+    }
+
     @Override
     public void didInit (PlaceConfig config)
     {
@@ -566,21 +590,10 @@ public class TrickCardGameManagerDelegate extends TurnGameManagerDelegate
     }
 
     /** The all-purpose turn timeout interval.  */
-    protected Interval _turnTimeoutInterval = new Interval(_omgr) {
-        @Override
-        public void expired () {
-            _turnTimedOut = true;
-            turnTimedOut();
-        }
-    };
+    protected Interval _turnTimeoutInterval;
 
     /** Calls {@link #endTrick} upon expiration. */
-    protected Interval _endTrickInterval = new Interval(_omgr) {
-        @Override
-        public void expired () {
-            endTrick();
-        }
-    };
+    protected Interval _endTrickInterval;
 
     /** The card game manager. */
     protected CardGameManager _cgmgr;