diff --git a/mozilla/js/rhino/org/mozilla/javascript/NativeObject.java b/mozilla/js/rhino/org/mozilla/javascript/NativeObject.java
index be659670608..ac40130085c 100644
--- a/mozilla/js/rhino/org/mozilla/javascript/NativeObject.java
+++ b/mozilla/js/rhino/org/mozilla/javascript/NativeObject.java
@@ -73,7 +73,7 @@ public class NativeObject extends ScriptableObject {
     }
 
     public String toString() {
-        Context cx = Context.getContext();
+        Context cx = Context.getCurrentContext();
         if (cx != null)
             return jsFunction_toString(cx, this, null, null);
         else
diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/NativeObject.java b/mozilla/js/rhino/src/org/mozilla/javascript/NativeObject.java
index be659670608..ac40130085c 100644
--- a/mozilla/js/rhino/src/org/mozilla/javascript/NativeObject.java
+++ b/mozilla/js/rhino/src/org/mozilla/javascript/NativeObject.java
@@ -73,7 +73,7 @@ public class NativeObject extends ScriptableObject {
     }
 
     public String toString() {
-        Context cx = Context.getContext();
+        Context cx = Context.getCurrentContext();
         if (cx != null)
             return jsFunction_toString(cx, this, null, null);
         else