AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enhanced error reporting.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2192 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2003-01-18 22:52:38 +00:00
parent 01bd0d33e8
commit 49e3e42b13
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/whirled/spot/server/SpotSceneManager.java
+14 -10
View File
@@ -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; package com.threerings.whirled.spot.server;
@@ -246,18 +246,22 @@ public class SpotSceneManager extends SceneManager
int sourceOid, String source, int locationId, int sourceOid, String source, int locationId,
String bundle, String message, byte mode) String bundle, String message, byte mode)
{ {
int locIdx = _sscene.getLocationIndex(locationId);
// make sure this user occupies the specified location // make sure this user occupies the specified location
int locidx = _sscene.getLocationIndex(locationId); int locOccId = (locIdx == -1) ? -1 : _locationOccs[locIdx];
if (locidx == -1 || _locationOccs[locidx] != sourceOid) { if (locOccId != sourceOid) {
Log.warning("User not in specified location for CCREQ " + Log.warning("User not in specified location for CCREQ " +
"[where=" + where() + ", chatter=" + source + "[where=" + where() + ", chatter=" + source +
" (" + sourceOid + "), locId=" + locationId + " (" + sourceOid + "), locId=" + locationId +
", locidx=" + locidx + ", message=" + message + "]."); ", locIdx=" + locIdx +
", locOccs=" + StringUtil.toString(_locationOccs) +
", message=" + message + "].");
return; return;
} }
// make sure there's a cluster associated with this location // make sure there's a cluster associated with this location
int clusterIndex = _sscene.getClusterIndex(locidx); int clusterIndex = _sscene.getClusterIndex(locIdx);
if (clusterIndex == -1) { if (clusterIndex == -1) {
Log.warning("User in clusterless location sent CCREQ " + Log.warning("User in clusterless location sent CCREQ " +
"[where=" + where() + ", chatter=" + source + "[where=" + where() + ", chatter=" + source +
@@ -266,17 +270,17 @@ public class SpotSceneManager extends SceneManager
return; return;
} }
// all is well, generate a chat notification
DObject clusterObj = _clusterObjs[clusterIndex]; DObject clusterObj = _clusterObjs[clusterIndex];
if (clusterObj != null) { if (clusterObj == null) {
SpeakProvider.sendSpeak(clusterObj, source, bundle, message, mode);
} else {
Log.warning("Have no cluster object for CCREQ " + Log.warning("Have no cluster object for CCREQ " +
"[where=" + where() + ", cidx=" + clusterIndex + "[where=" + where() + ", cidx=" + clusterIndex +
", chatter=" + source + " (" + sourceOid + ", chatter=" + source + " (" + sourceOid +
"), message=" + message + "]."); "), message=" + message + "].");
return;
} }
// all is well, generate a chat notification
SpeakProvider.sendSpeak(clusterObj, source, bundle, message, mode);
} }
/** /**