From df356599fc818bc8f7d54e128076d47bda708ca6 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Tue, 26 Jan 2010 03:10:53 +0000 Subject: [PATCH] Don't complain if we didn't init our PeerManager; we don't do that if we're not running in a peered environment. Technically it might be better to add the PeerManager to the lifecycle in init, but I don't want to screw with the shutdown order, and this is the lowest-impact solution. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6021 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../com/threerings/presents/peer/server/PeerManager.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/java/com/threerings/presents/peer/server/PeerManager.java b/src/java/com/threerings/presents/peer/server/PeerManager.java index 21f912952..c8c1029e2 100644 --- a/src/java/com/threerings/presents/peer/server/PeerManager.java +++ b/src/java/com/threerings/presents/peer/server/PeerManager.java @@ -767,9 +767,8 @@ public abstract class PeerManager // from interface Lifecycle.ShutdownComponent public void shutdown () { - if (_nodeName == null) { // sanity check - throw new IllegalStateException( - "Shutting down PeerManager that was never initialized."); + if (_nodeName == null) { // never initialized + return; } // clear out our invocation service