diff --git a/src/java/com/threerings/presents/server/InvocationManager.java b/src/java/com/threerings/presents/server/InvocationManager.java index 966b68934..f86f9b6ad 100644 --- a/src/java/com/threerings/presents/server/InvocationManager.java +++ b/src/java/com/threerings/presents/server/InvocationManager.java @@ -44,7 +44,6 @@ import com.threerings.presents.dobj.DObject; import com.threerings.presents.dobj.EventListener; import com.threerings.presents.dobj.InvocationRequestEvent; import com.threerings.presents.dobj.ObjectAccessException; -import com.threerings.presents.dobj.RootDObjectManager; import com.threerings.presents.net.Transport; @@ -76,9 +75,10 @@ public class InvocationManager * operate its invocation services. Generally only one invocation manager should be operational * in a particular system. */ - @Inject public InvocationManager (RootDObjectManager omgr) + @Inject public InvocationManager (PresentsDObjectMgr omgr) { _omgr = omgr; + _omgr._invmgr = this; // create the object on which we'll listen for invocation requests DObject invobj = _omgr.registerObject(new DObject()); @@ -314,7 +314,7 @@ public class InvocationManager protected int _invCode; /** The distributed object manager we're working with. */ - protected RootDObjectManager _omgr; + protected PresentsDObjectMgr _omgr; /** A table of invocation dispatchers each mapped by a unique code. */ protected IntMap _dispatchers = IntMaps.newHashIntMap(); diff --git a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java b/src/java/com/threerings/presents/server/PresentsDObjectMgr.java index 3764a95e6..32c7dc5c6 100644 --- a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java +++ b/src/java/com/threerings/presents/server/PresentsDObjectMgr.java @@ -991,8 +991,8 @@ public class PresentsDObjectMgr /** Maps event classes to helpers that perform additional processing for particular events. */ protected Map _helpers = Maps.newHashMap(); - // injected dependencies - @Inject protected InvocationManager _invmgr; + /** Used to resolve unit names when profiling. Injected by the invmgr when it's created. */ + protected InvocationManager _invmgr; /** Whether or not unit profiling is enabled. */ protected static final boolean UNIT_PROF_ENABLED = false;