From c67a443fc969224ab22b1328eaf7d00ce81e9326 Mon Sep 17 00:00:00 2001
From: "igor%mir2.org" <igor%mir2.org>
Date: Sat, 16 Oct 2004 00:37:05 +0000
Subject: [PATCH] Fixing bug 263978: for compatibility with BSF usage
 IllegalArgumentException is not thrown on negative line numbers.

---
 js/rhino/docs/changes.html                    | 12 +++++++++++-
 js/rhino/docs/download.html                   | 19 ++++++++-----------
 .../src/org/mozilla/javascript/Context.java   |  8 ++++----
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/js/rhino/docs/changes.html b/js/rhino/docs/changes.html
index 17a0cfbecb4..583c2f1d108 100644
--- a/js/rhino/docs/changes.html
+++ b/js/rhino/docs/changes.html
@@ -17,7 +17,7 @@ P { text-align: justify; }
 <h1 align="center">
 Change Log for Rhino</h1>
 
-<h2>Release candidate 2 for Rhino 1.6R1</h2>
+<h2>Rhino 1.6R1</h2>
 
 <h3>Release overview</h3>
 <p>
@@ -135,6 +135,16 @@ The following classes that were deprecated in Rhino 1.5R5 are no longer availabl
 See documentation for <a href="apidocs/org/mozilla/javascript/optimizer/ClassCompiler.html"><tt>org.mozilla.javascript.optimizer.ClassCompiler</tt></a> that provides replacement for ClassNameHelper and ClassRepository.
 </p>
 
+<h2>Change logs for previous Rhino releases</h2>
+<ul>
+  <li><a href="rhino15R5.html">Rhino 1.5R5</a></li>
+  <li><a href="rhino15R41.html">Rhino 1.5R4.1</a></li>
+  <li><a href="rhino15R4.html">Rhino 1.5R4</a></li>
+  <li><a href="rhino15R3.html">Rhino 1.5R3</a></li>
+  <li><a href="rhino15R2.html">Rhino 1.5R2</a></li>
+  <li><a href="rhino15R1.html">Rhino 1.5R1</a></li>
+</ul>
+
 <hr width="100%"><br>
 <a href="index.html">back to top</a></h3>
 
diff --git a/js/rhino/docs/download.html b/js/rhino/docs/download.html
index 5dfb84adf4b..579470d612e 100644
--- a/js/rhino/docs/download.html
+++ b/js/rhino/docs/download.html
@@ -17,23 +17,20 @@ You can download binary distributions of Rhino from <a
 </p>
 
 <p>
-Rhino 1.5R5 is the last qualified release. It is also possible to download the
-release candidate 2 for Rhino 1.6R1 but it has not been fully qualified. 
-</p>
-<p>
-Release candidate 2 for Rhino 1.6R1 includes support for <a
-href="http://www.ecma-international.org/publications/standards/Ecma-357.htm">ECMAScript
-for XML</a> (E4X). Please try this out and report any issues as described at
-the <a href="help.html">help</a> pages. Note that you need to add
-<tt>xbean.jar</tt> from <a
+Rhino 1.6R1 is the last qualified release. It includes support for <a
+href="http://www.ecma-international.org/publications/standards/Ecma-357.htm">ECMAScript for XML</a> (E4X). Note that you need to add <tt>xbean.jar</tt> from <a
 href="http://xmlbeans.apache.org/">XMLBeans</a> project to your class path
 if you use E4X in Rhino.
+<!--
+It is also possible to download the
+release candidate 2 for Rhino 1.6R1 but it has not been fully qualified. 
+-->
 </p>
 
 <ul>
-  <li> <a href="ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_6R1pre.zip">Rhino 1.6R1 Release Candidate 2</a>
+  <li> <a href="ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_6R1.zip">Rhino 1.6R1</a>
   <ul>
-    <li> <font size="-1"><a href="changes.html">Change log</a></font></li>
+    <li> <font size="-1"><a href="rhino16R1.html">Change log</a></font></li>
   </ul>
   </li>
  
diff --git a/js/rhino/src/org/mozilla/javascript/Context.java b/js/rhino/src/org/mozilla/javascript/Context.java
index 48fac8f3fe2..c6e9452c82f 100644
--- a/js/rhino/src/org/mozilla/javascript/Context.java
+++ b/js/rhino/src/org/mozilla/javascript/Context.java
@@ -1319,8 +1319,8 @@ public class Context
         throws IOException
     {
         if (lineno < 0) {
-            throw new IllegalArgumentException(
-                "Line number can not be negative:"+lineno);
+            // For compatibility IllegalArgumentException can not be thrown here
+            lineno = 0;
         }
         return (Script) compileImpl(null, in, null, sourceName, lineno,
                                     securityDomain, false, null, null);
@@ -1346,8 +1346,8 @@ public class Context
                                       Object securityDomain)
     {
         if (lineno < 0) {
-            throw new IllegalArgumentException(
-                "Line number can not be negative:"+lineno);
+            // For compatibility IllegalArgumentException can not be thrown here
+            lineno = 0;
         }
         return compileString(source, null, null, sourceName, lineno,
                              securityDomain);