From 8856ae43a0633fcc678398b7a970b5940a840a31 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Wed, 15 Sep 2004 18:21:26 +0000
Subject: [PATCH] Made session ending more robust in the face of potential
 boocehs by derived classes.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3118 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../com/threerings/presents/server/ClientManager.java    | 7 ++++---
 .../com/threerings/presents/server/PresentsClient.java   | 9 +++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/java/com/threerings/presents/server/ClientManager.java b/src/java/com/threerings/presents/server/ClientManager.java
index 6f7a21cd6..00e92ebbe 100644
--- a/src/java/com/threerings/presents/server/ClientManager.java
+++ b/src/java/com/threerings/presents/server/ClientManager.java
@@ -1,5 +1,5 @@
 //
-// $Id: ClientManager.java,v 1.38 2004/08/27 02:20:23 mdb Exp $
+// $Id: ClientManager.java,v 1.39 2004/09/15 18:21:26 mdb Exp $
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -427,14 +427,15 @@ public class ClientManager
 
         if (victims != null) {
             for (int ii = 0; ii < victims.size(); ii++) {
+                PresentsClient client = (PresentsClient)victims.get(ii);
                 try {
-                    PresentsClient client = (PresentsClient)victims.get(ii);
                     Log.info("Client expired, ending session " +
                         "[client=" + client +
                         ", dtime=" + (now-client.getNetworkStamp()) + "ms].");
                     client.endSession();
                 } catch (Exception e) {
-                    Log.warning("Choke while flushing clients.");
+                    Log.warning("Choke while flushing client " +
+                                "[victim=" + client + "].");
                     Log.logStackTrace(e);
                 }
             }
diff --git a/src/java/com/threerings/presents/server/PresentsClient.java b/src/java/com/threerings/presents/server/PresentsClient.java
index 08a5f3614..d24424245 100644
--- a/src/java/com/threerings/presents/server/PresentsClient.java
+++ b/src/java/com/threerings/presents/server/PresentsClient.java
@@ -1,5 +1,5 @@
 //
-// $Id: PresentsClient.java,v 1.67 2004/08/27 02:20:23 mdb Exp $
+// $Id: PresentsClient.java,v 1.68 2004/09/15 18:21:26 mdb Exp $
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -402,7 +402,12 @@ public class PresentsClient
         // first place, in which case we have to cope as best we can
         if (_clobj != null) {
             // and clean up after ourselves
-            sessionDidEnd();
+            try {
+                sessionDidEnd();
+            } catch (Exception e) {
+                Log.warning("Choked in sessionDidEnd [client=" + this + "].");
+                Log.logStackTrace(e);
+            }
 
             // release (and destroy) our client object
             _cmgr.releaseClientObject(_username);