From 71c392555fa7d031f2657638cf9ed7091541b6b1 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Wed, 17 Jul 2002 01:54:33 +0000 Subject: [PATCH] Fixed bug in dobj reference management. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1581 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../com/threerings/presents/server/PresentsDObjectMgr.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java b/src/java/com/threerings/presents/server/PresentsDObjectMgr.java index 8fcee0015..855901ffa 100644 --- a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java +++ b/src/java/com/threerings/presents/server/PresentsDObjectMgr.java @@ -1,5 +1,5 @@ // -// $Id: PresentsDObjectMgr.java,v 1.24 2002/03/20 03:23:00 mdb Exp $ +// $Id: PresentsDObjectMgr.java,v 1.25 2002/07/17 01:54:33 mdb Exp $ package com.threerings.presents.server; @@ -431,7 +431,8 @@ public class PresentsDObjectMgr implements RootDObjectManager // look for the matching reference for (int i = 0; i < refs.length; i++) { - if (refs[i].equals(toid, field)) { + Reference ref = refs[i]; + if (ref != null && ref.equals(toid, field)) { // Log.info("Removed reference " + refs[i] + "."); refs[i] = null; return true;