From b029b5d8c30b76418a433ad441e3ac022ee95d15 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Wed, 17 Dec 2003 00:15:08 +0000 Subject: [PATCH] Clear our active flag before passing requestFailed() onto the subscriber so that things go smoothly if they decide in requestFailed() to call unsubscribe() in the course of their normal shuttings down. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2920 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/presents/util/SafeSubscriber.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/java/com/threerings/presents/util/SafeSubscriber.java b/src/java/com/threerings/presents/util/SafeSubscriber.java index 090a6d9bd..ca690d408 100644 --- a/src/java/com/threerings/presents/util/SafeSubscriber.java +++ b/src/java/com/threerings/presents/util/SafeSubscriber.java @@ -1,5 +1,5 @@ // -// $Id: SafeSubscriber.java,v 1.4 2003/12/15 17:12:11 mdb Exp $ +// $Id: SafeSubscriber.java,v 1.5 2003/12/17 00:15:08 mdb Exp $ package com.threerings.presents.util; @@ -187,10 +187,10 @@ public class SafeSubscriber // if we're active, let our subscriber know that the shit hit the fan if (_active) { - _subscriber.requestFailed(oid, cause); - // and deactivate ourselves as we never got our object (and - // thus the real subscriber need not call unsubscribe()) + // deactivate ourselves as we never got our object (and thus + // the real subscriber need not call unsubscribe()) _active = false; + _subscriber.requestFailed(oid, cause); } }