From 8703f5b0a82e7cff2a7365071a8b9cd5011e6b0c Mon Sep 17 00:00:00 2001 From: Ray Greenwell Date: Fri, 1 Sep 2006 21:07:27 +0000 Subject: [PATCH] Don't allow scene resolution to continue if the updates couldn't load. They *are* just updates, but if it's ok for them to not load then a game-specific scene repository needs to make that decision and just return a blank update list rather than throwing an exception. git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@68 c613c5cb-e716-0410-b11b-feb51c14d237 --- src/java/com/threerings/whirled/server/SceneRegistry.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/java/com/threerings/whirled/server/SceneRegistry.java b/src/java/com/threerings/whirled/server/SceneRegistry.java index 67bbeff0..998048c3 100644 --- a/src/java/com/threerings/whirled/server/SceneRegistry.java +++ b/src/java/com/threerings/whirled/server/SceneRegistry.java @@ -211,10 +211,10 @@ public class SceneRegistry // this is run on the dobjmgr thread public void handleResult () { - if (_model != null) { - processSuccessfulResolution(_model, _updates); - } else if (_cause != null) { + if (_cause != null) { processFailedResolution(fsceneId, _cause); + } else if (_model != null) { + processSuccessfulResolution(_model, _updates); } else { Log.warning("Scene loading unit finished with " + "neither a scene nor a reason for " +