Use a library method to check equality with possible nulls.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@78 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
@@ -23,6 +23,7 @@ package com.threerings.parlor.client {
|
|||||||
|
|
||||||
import com.threerings.util.ArrayUtil;
|
import com.threerings.util.ArrayUtil;
|
||||||
import com.threerings.util.ObserverList;
|
import com.threerings.util.ObserverList;
|
||||||
|
import com.threerings.util.Util;
|
||||||
|
|
||||||
import com.threerings.presents.client.BasicDirector;
|
import com.threerings.presents.client.BasicDirector;
|
||||||
import com.threerings.presents.client.Client;
|
import com.threerings.presents.client.Client;
|
||||||
@@ -314,8 +315,7 @@ public class TableDirector extends BasicDirector
|
|||||||
}
|
}
|
||||||
|
|
||||||
// if nothing changed, bail now
|
// if nothing changed, bail now
|
||||||
if (oldTable == _ourTable ||
|
if (Util.equals(oldTable, _ourTable)) {
|
||||||
(oldTable != null && oldTable.equals(_ourTable))) {
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -22,6 +22,7 @@
|
|||||||
package com.threerings.parlor.client;
|
package com.threerings.parlor.client;
|
||||||
|
|
||||||
import com.samskivert.util.ListUtil;
|
import com.samskivert.util.ListUtil;
|
||||||
|
import com.samskivert.util.ObjectUtil;
|
||||||
import com.samskivert.util.ObserverList;
|
import com.samskivert.util.ObserverList;
|
||||||
|
|
||||||
import com.threerings.presents.client.BasicDirector;
|
import com.threerings.presents.client.BasicDirector;
|
||||||
@@ -309,8 +310,7 @@ public class TableDirector extends BasicDirector
|
|||||||
}
|
}
|
||||||
|
|
||||||
// if nothing changed, bail now
|
// if nothing changed, bail now
|
||||||
if (oldTable == _ourTable ||
|
if (ObjectUtil.equals(oldTable, _ourTable)) {
|
||||||
(oldTable != null && oldTable.equals(_ourTable))) {
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user