From b295fb2630368fa4230f26b9e848ca0dbb2e4dfd Mon Sep 17 00:00:00 2001 From: Ray Greenwell Date: Sat, 8 Jan 2005 22:05:00 +0000 Subject: [PATCH] Regenerated with non-NPEing code.Regenerated with non-NPEing code.Regenerated with non-NPEing code.Regenerated with non-NPEing code. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3300 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/crowd/data/PlaceObject.java | 2 +- .../com/threerings/micasa/lobby/table/TableLobbyObject.java | 2 +- src/java/com/threerings/parlor/game/GameObject.java | 4 ++-- src/java/com/threerings/presents/data/ClientObject.java | 2 +- src/java/com/threerings/puzzle/data/PuzzleObject.java | 4 ++-- .../com/threerings/whirled/spot/data/SpotSceneObject.java | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/java/com/threerings/crowd/data/PlaceObject.java b/src/java/com/threerings/crowd/data/PlaceObject.java index ca1a7b765..6800aed7a 100644 --- a/src/java/com/threerings/crowd/data/PlaceObject.java +++ b/src/java/com/threerings/crowd/data/PlaceObject.java @@ -179,7 +179,7 @@ public class PlaceObject extends DObject public void setOccupantInfo (DSet value) { requestAttributeChange(OCCUPANT_INFO, value, this.occupantInfo); - this.occupantInfo = (DSet)value.clone(); + this.occupantInfo = (value == null) ? null : (DSet)value.clone(); } /** diff --git a/src/java/com/threerings/micasa/lobby/table/TableLobbyObject.java b/src/java/com/threerings/micasa/lobby/table/TableLobbyObject.java index 2745af8b2..0ac907d0e 100644 --- a/src/java/com/threerings/micasa/lobby/table/TableLobbyObject.java +++ b/src/java/com/threerings/micasa/lobby/table/TableLobbyObject.java @@ -105,7 +105,7 @@ public class TableLobbyObject public void setTableSet (DSet value) { requestAttributeChange(TABLE_SET, value, this.tableSet); - this.tableSet = (DSet)value.clone(); + this.tableSet = (value == null) ? null : (DSet)value.clone(); } // AUTO-GENERATED: METHODS END } diff --git a/src/java/com/threerings/parlor/game/GameObject.java b/src/java/com/threerings/parlor/game/GameObject.java index 051aac8e3..701450256 100644 --- a/src/java/com/threerings/parlor/game/GameObject.java +++ b/src/java/com/threerings/parlor/game/GameObject.java @@ -265,7 +265,7 @@ public class GameObject extends PlaceObject Name[] ovalue = this.players; requestAttributeChange( PLAYERS, value, ovalue); - this.players = (Name[])value.clone(); + this.players = (value == null) ? null : (Name[])value.clone(); } /** @@ -298,7 +298,7 @@ public class GameObject extends PlaceObject boolean[] ovalue = this.winners; requestAttributeChange( WINNERS, value, ovalue); - this.winners = (boolean[])value.clone(); + this.winners = (value == null) ? null : (boolean[])value.clone(); } /** diff --git a/src/java/com/threerings/presents/data/ClientObject.java b/src/java/com/threerings/presents/data/ClientObject.java index fb30c4a66..9fe7b064a 100644 --- a/src/java/com/threerings/presents/data/ClientObject.java +++ b/src/java/com/threerings/presents/data/ClientObject.java @@ -125,7 +125,7 @@ public class ClientObject extends DObject public void setReceivers (DSet value) { requestAttributeChange(RECEIVERS, value, this.receivers); - this.receivers = (DSet)value.clone(); + this.receivers = (value == null) ? null : (DSet)value.clone(); } // AUTO-GENERATED: METHODS END } diff --git a/src/java/com/threerings/puzzle/data/PuzzleObject.java b/src/java/com/threerings/puzzle/data/PuzzleObject.java index 88d8ab863..5ffc25cbb 100644 --- a/src/java/com/threerings/puzzle/data/PuzzleObject.java +++ b/src/java/com/threerings/puzzle/data/PuzzleObject.java @@ -145,7 +145,7 @@ public class PuzzleObject extends GameObject int[] ovalue = this.playerStatus; requestAttributeChange( PLAYER_STATUS, value, ovalue); - this.playerStatus = (int[])value.clone(); + this.playerStatus = (value == null) ? null : (int[])value.clone(); } /** @@ -178,7 +178,7 @@ public class PuzzleObject extends GameObject BoardSummary[] ovalue = this.summaries; requestAttributeChange( SUMMARIES, value, ovalue); - this.summaries = (BoardSummary[])value.clone(); + this.summaries = (value == null) ? null : (BoardSummary[])value.clone(); } /** diff --git a/src/java/com/threerings/whirled/spot/data/SpotSceneObject.java b/src/java/com/threerings/whirled/spot/data/SpotSceneObject.java index ddd0b4972..e038a561e 100644 --- a/src/java/com/threerings/whirled/spot/data/SpotSceneObject.java +++ b/src/java/com/threerings/whirled/spot/data/SpotSceneObject.java @@ -88,7 +88,7 @@ public class SpotSceneObject extends SceneObject public void setOccupantLocs (DSet value) { requestAttributeChange(OCCUPANT_LOCS, value, this.occupantLocs); - this.occupantLocs = (DSet)value.clone(); + this.occupantLocs = (value == null) ? null : (DSet)value.clone(); } /** @@ -134,7 +134,7 @@ public class SpotSceneObject extends SceneObject public void setClusters (DSet value) { requestAttributeChange(CLUSTERS, value, this.clusters); - this.clusters = (DSet)value.clone(); + this.clusters = (value == null) ? null : (DSet)value.clone(); } // AUTO-GENERATED: METHODS END }