From d2ee77e08e43d34e3e76eb558b9f6243b817f7e5 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Sat, 2 Feb 2002 09:53:00 +0000 Subject: [PATCH] Use safeToString() when logging the object that caused a subscriber to choke so that we don't choke if DObject.toString() chokes. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@919 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../com/threerings/presents/server/PresentsDObjectMgr.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java b/src/java/com/threerings/presents/server/PresentsDObjectMgr.java index e18fb0c45..722f1c877 100644 --- a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java +++ b/src/java/com/threerings/presents/server/PresentsDObjectMgr.java @@ -1,5 +1,5 @@ // -// $Id: PresentsDObjectMgr.java,v 1.21 2002/02/02 09:42:36 mdb Exp $ +// $Id: PresentsDObjectMgr.java,v 1.22 2002/02/02 09:53:00 mdb Exp $ package com.threerings.presents.server; @@ -8,6 +8,7 @@ import java.util.HashMap; import com.samskivert.util.HashIntMap; import com.samskivert.util.Queue; +import com.samskivert.util.StringUtil; import com.threerings.presents.Log; import com.threerings.presents.dobj.*; @@ -441,7 +442,8 @@ public class PresentsDObjectMgr implements RootDObjectManager sub.objectAvailable(obj); } catch (Exception e) { Log.warning("Subscriber choked during object available " + - "[obj=" + obj + ", sub=" + sub + "]."); + "[obj=" + StringUtil.safeToString(obj) + + ", sub=" + sub + "]."); Log.logStackTrace(e); } }