From d86c851856cb85635531ba0d6355fa4140db4ce6 Mon Sep 17 00:00:00 2001 From: Mark Johnson Date: Tue, 5 Feb 2013 13:48:57 -0800 Subject: [PATCH] Require passing in the DObjectManager for activatePeriodicReport instead of injecting it which was causing a circular dependency --- .../com/threerings/presents/server/ReportManager.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/com/threerings/presents/server/ReportManager.java b/core/src/main/java/com/threerings/presents/server/ReportManager.java index 87aae6d35..7a8f08e94 100644 --- a/core/src/main/java/com/threerings/presents/server/ReportManager.java +++ b/core/src/main/java/com/threerings/presents/server/ReportManager.java @@ -23,7 +23,6 @@ package com.threerings.presents.server; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; -import com.google.inject.Inject; import com.google.inject.Singleton; import com.samskivert.util.StringUtil; @@ -65,10 +64,10 @@ public class ReportManager /** * Starts up our periodic report generation task. */ - public void activatePeriodicReport () + public void activatePeriodicReport (RootDObjectManager omgr) { // queue up an interval which will generate reports as long as the omgr is alive - _omgr.newInterval(new Runnable() { + omgr.newInterval(new Runnable() { public void run () { logReport(LOG_REPORT_HEADER + generateReport(DEFAULT_TYPE, System.currentTimeMillis(), true)); @@ -191,9 +190,6 @@ public class ReportManager /** Used to generate "state of server" reports. */ protected Multimap _reporters = ArrayListMultimap.create(); - /** We use the root omgr to queue up our reporting interval. */ - @Inject protected RootDObjectManager _omgr; - /** The frequency with which we generate "state of server" reports. */ protected static final long REPORT_INTERVAL = 15 * 60 * 1000L;