From eac5cc2e01183af9bd24b5ba9c8096c537a79ed8 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Tue, 9 Dec 2003 20:57:14 +0000
Subject: [PATCH] The body object might have already been destroyed by the time
 we get here. If so, don't start a transaction on it just let the events
 quietly float off into the ether.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2898 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../whirled/spot/server/SpotSceneManager.java          | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java b/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java
index b7f6109a5..794683f69 100644
--- a/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java
+++ b/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java
@@ -1,5 +1,5 @@
 //
-// $Id: SpotSceneManager.java,v 1.47 2003/11/24 20:42:22 mdb Exp $
+// $Id: SpotSceneManager.java,v 1.48 2003/12/09 20:57:14 mdb Exp $
 
 package com.threerings.whirled.spot.server;
 
@@ -483,7 +483,9 @@ public class SpotSceneManager extends SceneManager
                 return;
             }
 
-            body.startTransaction();
+            if (body.isActive()) {
+                body.startTransaction();
+            }
             try {
                 _ssobj.startTransaction();
                 try {
@@ -499,7 +501,9 @@ public class SpotSceneManager extends SceneManager
                     _ssobj.commitTransaction();
                 }
             } finally {
-                body.commitTransaction();
+                if (body.isActive()) {
+                    body.commitTransaction();
+                }
             }
 
 //             Log.debug("Removed " + bodyOid + " from "+ this + ".");