From 49e3e42b13dd384302d34252869c14716cae05f1 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Sat, 18 Jan 2003 22:52:38 +0000
Subject: [PATCH] Enhanced error reporting.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2192 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../whirled/spot/server/SpotSceneManager.java | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java b/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java
index aeec58ddd..353de3a91 100644
--- a/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java
+++ b/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java
@@ -1,5 +1,5 @@
 //
-// $Id: SpotSceneManager.java,v 1.21 2002/11/04 23:02:10 mdb Exp $
+// $Id: SpotSceneManager.java,v 1.22 2003/01/18 22:52:38 mdb Exp $
 
 package com.threerings.whirled.spot.server;
 
@@ -246,18 +246,22 @@ public class SpotSceneManager extends SceneManager
         int sourceOid, String source, int locationId,
         String bundle, String message, byte mode)
     {
+        int locIdx = _sscene.getLocationIndex(locationId);
+
         // make sure this user occupies the specified location
-        int locidx = _sscene.getLocationIndex(locationId);
-        if (locidx == -1 || _locationOccs[locidx] != sourceOid) {
+        int locOccId = (locIdx == -1) ? -1 : _locationOccs[locIdx];
+        if (locOccId != sourceOid) {
             Log.warning("User not in specified location for CCREQ " +
                         "[where=" + where() + ", chatter=" + source +
                         " (" + sourceOid + "), locId=" + locationId +
-                        ", locidx=" + locidx + ", message=" + message + "].");
+                        ", locIdx=" + locIdx +
+                        ", locOccs=" + StringUtil.toString(_locationOccs) +
+                        ", message=" + message + "].");
             return;
         }
 
         // make sure there's a cluster associated with this location
-        int clusterIndex = _sscene.getClusterIndex(locidx);
+        int clusterIndex = _sscene.getClusterIndex(locIdx);
         if (clusterIndex == -1) {
             Log.warning("User in clusterless location sent CCREQ " +
                         "[where=" + where() + ", chatter=" + source +
@@ -266,17 +270,17 @@ public class SpotSceneManager extends SceneManager
             return;
         }
 
-        // all is well, generate a chat notification
         DObject clusterObj = _clusterObjs[clusterIndex];
-        if (clusterObj != null) {
-            SpeakProvider.sendSpeak(clusterObj, source, bundle, message, mode);
-
-        } else {
+        if (clusterObj == null) {
             Log.warning("Have no cluster object for CCREQ " +
                         "[where=" + where() + ", cidx=" + clusterIndex +
                         ", chatter=" + source + " (" + sourceOid +
                         "), message=" + message + "].");
+            return;
         }
+
+        // all is well, generate a chat notification
+        SpeakProvider.sendSpeak(clusterObj, source, bundle, message, mode);
     }
 
     /**