Use Comparable for the to be removed distributed set key.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2290 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
//
|
||||
// $Id: PlaceObject.java,v 1.9 2002/10/09 06:33:48 mdb Exp $
|
||||
// $Id: PlaceObject.java,v 1.10 2003/02/26 17:54:55 mdb Exp $
|
||||
|
||||
package com.threerings.crowd.data;
|
||||
|
||||
@@ -97,7 +97,7 @@ public class PlaceObject extends DObject
|
||||
* the <code>occupantInfo</code> set. The set will not change until the
|
||||
* event is actually propagated through the system.
|
||||
*/
|
||||
public void removeFromOccupantInfo (Object key)
|
||||
public void removeFromOccupantInfo (Comparable key)
|
||||
{
|
||||
requestEntryRemove(OCCUPANT_INFO, key);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
//
|
||||
// $Id: LocationProvider.java,v 1.18 2002/10/04 01:31:43 mdb Exp $
|
||||
// $Id: LocationProvider.java,v 1.19 2003/02/26 17:54:56 mdb Exp $
|
||||
|
||||
package com.threerings.crowd.server;
|
||||
|
||||
@@ -154,7 +154,7 @@ public class LocationProvider
|
||||
try {
|
||||
PlaceObject pold = (PlaceObject)_omgr.getObject(oldloc);
|
||||
if (pold != null) {
|
||||
Object key = new Integer(bodoid);
|
||||
Integer key = new Integer(bodoid);
|
||||
try {
|
||||
pold.startTransaction();
|
||||
// remove their occupant info (which is keyed on oid)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
//
|
||||
// $Id: PlaceManager.java,v 1.42 2003/02/05 00:23:33 mdb Exp $
|
||||
// $Id: PlaceManager.java,v 1.43 2003/02/26 17:54:56 mdb Exp $
|
||||
|
||||
package com.threerings.crowd.server;
|
||||
|
||||
@@ -380,7 +380,7 @@ public class PlaceManager
|
||||
// if their occupant info hasn't been removed (which may be the
|
||||
// case if they logged off rather than left via a MoveTo request),
|
||||
// we need to get it on out of here
|
||||
Object key = new Integer(bodyOid);
|
||||
Integer key = new Integer(bodyOid);
|
||||
if (_plobj.occupantInfo.containsKey(key)) {
|
||||
_plobj.removeFromOccupantInfo(key);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user