From 612a23d049b90aaac0128a12ffd7ccaf46bfd87d Mon Sep 17 00:00:00 2001
From: "norris%netscape.com"
 <norris%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 28 Feb 2000 18:38:37 +0000
Subject: [PATCH] Some users with JDK 1.1 but JDK 1.2 security were getting
 NullPointerExceptions here.

git-svn-id: svn://10.0.0.236/trunk@61793 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/js/rhino/org/mozilla/javascript/ScriptRuntime.java     | 3 ++-
 mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mozilla/js/rhino/org/mozilla/javascript/ScriptRuntime.java b/mozilla/js/rhino/org/mozilla/javascript/ScriptRuntime.java
index 5da2626241b..13307eb8e31 100644
--- a/mozilla/js/rhino/org/mozilla/javascript/ScriptRuntime.java
+++ b/mozilla/js/rhino/org/mozilla/javascript/ScriptRuntime.java
@@ -2118,7 +2118,8 @@ public class ScriptRuntime {
                                   getContextClassLoaderMethod.invoke(
                                     Thread.currentThread(), 
                                     new Object[0]);
-                return cl.loadClass(className);
+                if (cl != null)
+                    return cl.loadClass(className);
             }
         } catch (SecurityException e) {
             // fall through...
diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java b/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java
index 5da2626241b..13307eb8e31 100644
--- a/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java
+++ b/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java
@@ -2118,7 +2118,8 @@ public class ScriptRuntime {
                                   getContextClassLoaderMethod.invoke(
                                     Thread.currentThread(), 
                                     new Object[0]);
-                return cl.loadClass(className);
+                if (cl != null)
+                    return cl.loadClass(className);
             }
         } catch (SecurityException e) {
             // fall through...