From f8ee0283fffb979d0c57f901092a23ae88a51f71 Mon Sep 17 00:00:00 2001
From: "igor%mir2.org" <igor%mir2.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 10 Aug 2004 15:52:19 +0000
Subject: [PATCH] In JavaAdapter.currentFactory() do not assume that there is
 always active Context available and fallback to ContextFactory.getGlobal() in
 that case.

git-svn-id: svn://10.0.0.236/trunk@160606 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../rhino/src/org/mozilla/javascript/JavaAdapter.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/JavaAdapter.java b/mozilla/js/rhino/src/org/mozilla/javascript/JavaAdapter.java
index 7e687854593..3f1d6b4a440 100644
--- a/mozilla/js/rhino/src/org/mozilla/javascript/JavaAdapter.java
+++ b/mozilla/js/rhino/src/org/mozilla/javascript/JavaAdapter.java
@@ -609,7 +609,16 @@ public final class JavaAdapter implements IdFunctionCall
 
     public static ContextFactory currentFactory()
     {
-        return Context.getContext().getFactory();
+        ContextFactory factory;
+        Context cx = Context.getCurrentContext();
+        if (cx == null) {
+            // It can happen during instantiating of classes created
+            // with the class compiler in script-unaware application.
+            factory = ContextFactory.getGlobal();
+        } else {
+            factory = cx.getFactory();
+        }
+        return factory;
     }
 
     /**