svn commit: r553194 - in /harmony/enhanced/classlib/trunk/modules/luni/src: main/java/java/io/InputStream.java test/api/common/tests/api/java/io/InputStreamTest.java

[to...@apache.org]

Author: tonywu
Date: Wed Jul  4 05:59:54 2007
New Revision: 553194

URL: http://svn.apache.org/viewvc?view=rev&rev=553194
Log:
Fix Harmony-4337 ([classlib][luni] Compatibility: InputStream.read(null, offset, len) exception throwing order differs on Harmony and RI if offset is negative)

Added:
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/InputStreamTest.java   (with props)
Modified:
    harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/InputStream.java

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/InputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/InputStream.java?view=diff&rev=553194&r1=553193&r2=553194
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/InputStream.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/InputStream.java Wed Jul  4 05:59:54 2007
@@ -141,7 +141,7 @@
      */
     public int read(byte b[], int offset, int length) throws IOException {
         // avoid int overflow, check null b
-        if (offset < 0 || offset > b.length || length < 0
+        if (offset > b.length || offset < 0 || length < 0
                 || length > b.length - offset) {
             throw new ArrayIndexOutOfBoundsException();
         }

Added: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/InputStreamTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/InputStreamTest.java?view=auto&rev=553194
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/InputStreamTest.java (added)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/InputStreamTest.java Wed Jul  4 05:59:54 2007
@@ -0,0 +1,42 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package tests.api.java.io;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import junit.framework.TestCase;
+
+public class InputStreamTest extends TestCase {
+    // Regression for HARMONY-4337
+    public void test1() throws IOException {
+        try {
+            InputStream in = new MockInputStream();
+            in.read(null, -1, 1);
+            fail("should throw NullPointerException.");
+        } catch (NullPointerException e) {
+            // expected
+        }
+    }
+
+    class MockInputStream extends InputStream {
+        public int read() throws IOException {
+            return 0;
+        }
+    }
+}

Propchange: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/io/InputStreamTest.java
------------------------------------------------------------------------------
    svn:eol-style = native