From d8a63e199d30e30b9d6b1c3eac6c2858be291a4f Mon Sep 17 00:00:00 2001 From: "norris%netscape.com" Date: Mon, 28 Feb 2000 18:40:34 +0000 Subject: [PATCH] Guard against possible NullPointerException if the Context has not been properly entered. git-svn-id: svn://10.0.0.236/trunk@61794 18797224-902f-48f8-a5cc-f745e15eee43 --- .../js/rhino/org/mozilla/javascript/optimizer/OptIRFactory.java | 2 +- .../src/org/mozilla/javascript/optimizer/OptIRFactory.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/js/rhino/org/mozilla/javascript/optimizer/OptIRFactory.java b/mozilla/js/rhino/org/mozilla/javascript/optimizer/OptIRFactory.java index a4ead222b3e..5324770ad9c 100644 --- a/mozilla/js/rhino/org/mozilla/javascript/optimizer/OptIRFactory.java +++ b/mozilla/js/rhino/org/mozilla/javascript/optimizer/OptIRFactory.java @@ -60,7 +60,7 @@ public class OptIRFactory extends IRFactory { (Node) statements, nameHelper); Context cx = Context.getCurrentContext(); - if (cx.getDebugLevel() > 0) + if (cx != null && cx.getDebugLevel() > 0) result.setRequiresActivation(true); return result; } diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/OptIRFactory.java b/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/OptIRFactory.java index a4ead222b3e..5324770ad9c 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/OptIRFactory.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/OptIRFactory.java @@ -60,7 +60,7 @@ public class OptIRFactory extends IRFactory { (Node) statements, nameHelper); Context cx = Context.getCurrentContext(); - if (cx.getDebugLevel() > 0) + if (cx != null && cx.getDebugLevel() > 0) result.setRequiresActivation(true); return result; }