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

Catch our funny choking getOccupantInfo and log the failure prior to

Browse Source 
allowing things to get out of hand. Since getOccupantInfo may normally
return null, doing so in our strange failure case will not cause further
freakout.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2697 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2003-07-11 00:47:33 +00:00
parent e140fd6301
commit e85e6ad617
2 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/crowd/data/PlaceObject.dobj
+18 -6
View File
@@ -1,5 +1,5 @@
//
// $Id: PlaceObject.dobj,v 1.15 2003/06/25 17:17:41 ray Exp $
// $Id: PlaceObject.dobj,v 1.16 2003/07/11 00:47:33 mdb Exp $
package com.threerings.crowd.data;
@@ -9,9 +9,16 @@ import com.threerings.presents.dobj.DObject;
import com.threerings.presents.dobj.DSet;
import com.threerings.presents.dobj.OidList;
import com.threerings.crowd.Log;
import com.threerings.crowd.chat.data.SpeakMarshaller;
import com.threerings.crowd.chat.data.SpeakObject;
/**
* A distributed object that contains information on a place that is
* occupied by bodies. This place might be a chat room, a game room, an
* island in a massively multiplayer piratical universe, anything that has
* occupants that might want to chat with one another.
*/
public class PlaceObject extends DObject
implements SpeakObject
{
@@ -54,12 +61,17 @@ public class PlaceObject extends DObject
*/
public OccupantInfo getOccupantInfo (String username)
{
Iterator iter = occupantInfo.entries();
while (iter.hasNext()) {
OccupantInfo info = (OccupantInfo)iter.next();
if (info.username.equals(username)) {
return info;
try {
Iterator iter = occupantInfo.entries();
while (iter.hasNext()) {
OccupantInfo info = (OccupantInfo)iter.next();
if (info.username.equals(username)) {
return info;
}
}
} catch (Throwable t) {
Log.warning("PlaceObject.getOccupantInfo choked.");
Log.logStackTrace(t);
}
return null;
}
src/java/com/threerings/crowd/data/PlaceObject.java
+18 -6
View File
@@ -1,5 +1,5 @@
//
// $Id: PlaceObject.java,v 1.14 2003/06/25 17:17:41 ray Exp $
// $Id: PlaceObject.java,v 1.15 2003/07/11 00:47:33 mdb Exp $
package com.threerings.crowd.data;
@@ -9,9 +9,16 @@ import com.threerings.presents.dobj.DObject;
import com.threerings.presents.dobj.DSet;
import com.threerings.presents.dobj.OidList;
import com.threerings.crowd.Log;
import com.threerings.crowd.chat.data.SpeakMarshaller;
import com.threerings.crowd.chat.data.SpeakObject;
/**
* A distributed object that contains information on a place that is
* occupied by bodies. This place might be a chat room, a game room, an
* island in a massively multiplayer piratical universe, anything that has
* occupants that might want to chat with one another.
*/
public class PlaceObject extends DObject
implements SpeakObject
{
@@ -63,12 +70,17 @@ public class PlaceObject extends DObject
*/
public OccupantInfo getOccupantInfo (String username)
{
Iterator iter = occupantInfo.entries();
while (iter.hasNext()) {
OccupantInfo info = (OccupantInfo)iter.next();
if (info.username.equals(username)) {
return info;
try {
Iterator iter = occupantInfo.entries();
while (iter.hasNext()) {
OccupantInfo info = (OccupantInfo)iter.next();
if (info.username.equals(username)) {
return info;
}
}
} catch (Throwable t) {
Log.warning("PlaceObject.getOccupantInfo choked.");
Log.logStackTrace(t);
}
return null;
}