From 0a5714b6619026766692d36da9ba28bbeae957e8 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Sun, 30 Mar 2003 19:38:56 +0000 Subject: [PATCH] Safety first! git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2354 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/presents/dobj/DObject.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/java/com/threerings/presents/dobj/DObject.java b/src/java/com/threerings/presents/dobj/DObject.java index b2c5cd7fc..d7725c5b3 100644 --- a/src/java/com/threerings/presents/dobj/DObject.java +++ b/src/java/com/threerings/presents/dobj/DObject.java @@ -1,5 +1,5 @@ // -// $Id: DObject.java,v 1.60 2003/03/10 18:29:54 mdb Exp $ +// $Id: DObject.java,v 1.61 2003/03/30 19:38:56 mdb Exp $ package com.threerings.presents.dobj; @@ -778,7 +778,7 @@ public class DObject implements Streamable // if we're on the authoritative server, we update the set // immediately boolean alreadyApplied = false; - if (_omgr.isManager(this)) { + if (_omgr != null && _omgr.isManager(this)) { // Log.info("Immediately adding [name=" + name + // ", entry=" + entry + "]."); set.add(entry); @@ -803,7 +803,7 @@ public class DObject implements Streamable // if we're on the authoritative server, we update the set // immediately DSet.Entry oldEntry = null; - if (_omgr.isManager(this)) { + if (_omgr != null && _omgr.isManager(this)) { // Log.info("Immediately removing [name=" + name + // ", key=" + key + "]."); oldEntry = set.get(key); @@ -828,7 +828,7 @@ public class DObject implements Streamable // if we're on the authoritative server, we update the set // immediately DSet.Entry oldEntry = null; - if (_omgr.isManager(this)) { + if (_omgr != null && _omgr.isManager(this)) { // Log.info("Immediately updating [name=" + name + // ", entry=" + entry + "]."); oldEntry = set.get(entry.getKey());