From 72ab82bd51fae1f58ca022b68b473b0ff1b6f3d9 Mon Sep 17 00:00:00 2001 From: megacz Date: Fri, 30 Jan 2004 06:46:05 +0000 Subject: [PATCH] 2002/04/28 03:49:17 darcs-hash:20040130064605-2ba56-ecbe21e713f75d5bb4b376c1fb3b3fe39509617a.gz --- CHANGES | 3 +++ src/org/xwt/util/JSObject.java | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 36abfd7..9306fa8 100644 --- a/CHANGES +++ b/CHANGES @@ -55,3 +55,6 @@ XWT upgrades work more smoothly, and to prevent problems with browser/plugin caches. +27-Apr megacz JSObject.java: added extra debugging info + + diff --git a/src/org/xwt/util/JSObject.java b/src/org/xwt/util/JSObject.java index 81f36ea..9f3f4bf 100644 --- a/src/org/xwt/util/JSObject.java +++ b/src/org/xwt/util/JSObject.java @@ -26,7 +26,12 @@ public class JSObject implements Scriptable { /** helper; retrieves the 'source code filename' (usually the nodeName) of the currently-executing function in this thread */ public static String getCurrentFunctionSourceName() { - Function cf = Context.getCurrentContext().currentFunction; + Context cx = Context.getCurrentContext(); + if (cx == null) { + if (Log.on) Log.log(JSObject.class, "Context.getCurrentContext() is null in getCurrentFunctionSourceName()"); + return "unknown"; + } + Function cf = cx.currentFunction; if (cf == null) return null; return (cf instanceof InterpretedFunction) ? ((InterpretedFunction)cf).getSourceName() : ((InterpretedScript)cf).getSourceName(); -- 1.7.10.4