diff options
13 files changed, 33 insertions, 27 deletions
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyCharBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyCharBufferTest.java index 8ff795699c..e567504dba 100644 --- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyCharBufferTest.java +++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyCharBufferTest.java @@ -140,8 +140,8 @@ public class ReadOnlyCharBufferTest extends CharBufferTest { } try { buf.put(buf); - fail("Should throw ReadOnlyBufferException"); //$NON-NLS-1$ - } catch (ReadOnlyBufferException e) { + fail("Should throw IllegalArgumentException"); //$NON-NLS-1$ + } catch (IllegalArgumentException e) { // expected } } diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyDoubleBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyDoubleBufferTest.java index f2f1ea41d9..1673c164a9 100644 --- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyDoubleBufferTest.java +++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyDoubleBufferTest.java @@ -137,8 +137,8 @@ public class ReadOnlyDoubleBufferTest extends DoubleBufferTest { } try { buf.put(buf); - fail("Should throw ReadOnlyBufferException"); //$NON-NLS-1$ - } catch (ReadOnlyBufferException e) { + fail("Should throw IllegalArgumentException"); //$NON-NLS-1$ + } catch (IllegalArgumentException e) { // expected } } diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyFloatBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyFloatBufferTest.java index 56a14babac..3aec858d3f 100644 --- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyFloatBufferTest.java +++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyFloatBufferTest.java @@ -138,8 +138,8 @@ public class ReadOnlyFloatBufferTest extends FloatBufferTest { } try { buf.put(buf); - fail("Should throw ReadOnlyBufferException"); //$NON-NLS-1$ - } catch (ReadOnlyBufferException e) { + fail("Should throw IllegalArgumentException"); //$NON-NLS-1$ + } catch (IllegalArgumentException e) { // expected } } diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyIntBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyIntBufferTest.java index e6187835fb..f0dcad01d7 100644 --- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyIntBufferTest.java +++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyIntBufferTest.java @@ -138,8 +138,8 @@ public class ReadOnlyIntBufferTest extends IntBufferTest { } try { buf.put(buf); - fail("Should throw ReadOnlyBufferException"); //$NON-NLS-1$ - } catch (ReadOnlyBufferException e) { + fail("Should throw IllegalArgumentException"); //$NON-NLS-1$ + } catch (IllegalArgumentException e) { // expected } } diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyLongBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyLongBufferTest.java index fd6438eb28..283f4f11d2 100644 --- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyLongBufferTest.java +++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyLongBufferTest.java @@ -138,8 +138,8 @@ public class ReadOnlyLongBufferTest extends LongBufferTest { } try { buf.put(buf); - fail("Should throw ReadOnlyBufferException"); //$NON-NLS-1$ - } catch (ReadOnlyBufferException e) { + fail("Should throw IllegalArgumentException"); //$NON-NLS-1$ + } catch (IllegalArgumentException e) { // expected } } diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyShortBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyShortBufferTest.java index aab913e926..88858060fe 100644 --- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyShortBufferTest.java +++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyShortBufferTest.java @@ -138,8 +138,8 @@ public class ReadOnlyShortBufferTest extends ShortBufferTest { } try { buf.put(buf); - fail("Should throw ReadOnlyBufferException"); //$NON-NLS-1$ - } catch (ReadOnlyBufferException e) { + fail("Should throw IllegalArgumentException"); //$NON-NLS-1$ + } catch (IllegalArgumentException e) { // expected } } diff --git a/ojluni/src/main/java/java/nio/ByteBuffer.java b/ojluni/src/main/java/java/nio/ByteBuffer.java index 523bbda8eb..c78447fa14 100644 --- a/ojluni/src/main/java/java/nio/ByteBuffer.java +++ b/ojluni/src/main/java/java/nio/ByteBuffer.java @@ -533,12 +533,12 @@ public abstract class ByteBuffer if (!isAccessible()) { throw new IllegalStateException("buffer is inaccessible"); } - if (isReadOnly) { - throw new ReadOnlyBufferException(); - } if (src == this) { throw new IllegalArgumentException(); } + if (isReadOnly) { + throw new ReadOnlyBufferException(); + } int n = src.remaining(); if (n > remaining()) { throw new BufferOverflowException(); diff --git a/ojluni/src/main/java/java/nio/HeapCharBuffer.java b/ojluni/src/main/java/java/nio/HeapCharBuffer.java index f67c91f0df..fad4fa64e8 100644 --- a/ojluni/src/main/java/java/nio/HeapCharBuffer.java +++ b/ojluni/src/main/java/java/nio/HeapCharBuffer.java @@ -165,12 +165,13 @@ class HeapCharBuffer extends CharBuffer { } public CharBuffer put(CharBuffer src) { + if (src == this) { + throw new IllegalArgumentException(); + } if (isReadOnly) { throw new ReadOnlyBufferException(); } if (src instanceof HeapCharBuffer) { - if (src == this) - throw new IllegalArgumentException(); HeapCharBuffer sb = (HeapCharBuffer) src; int n = sb.remaining(); if (n > remaining()) diff --git a/ojluni/src/main/java/java/nio/HeapDoubleBuffer.java b/ojluni/src/main/java/java/nio/HeapDoubleBuffer.java index e3d96346fb..02634dd267 100644 --- a/ojluni/src/main/java/java/nio/HeapDoubleBuffer.java +++ b/ojluni/src/main/java/java/nio/HeapDoubleBuffer.java @@ -160,12 +160,13 @@ class HeapDoubleBuffer extends DoubleBuffer { } public DoubleBuffer put(DoubleBuffer src) { + if (src == this) { + throw new IllegalArgumentException(); + } if (isReadOnly) { throw new ReadOnlyBufferException(); } if (src instanceof HeapDoubleBuffer) { - if (src == this) - throw new IllegalArgumentException(); HeapDoubleBuffer sb = (HeapDoubleBuffer)src; int n = sb.remaining(); if (n > remaining()) diff --git a/ojluni/src/main/java/java/nio/HeapFloatBuffer.java b/ojluni/src/main/java/java/nio/HeapFloatBuffer.java index ca341a0b6e..42dd8cedb8 100644 --- a/ojluni/src/main/java/java/nio/HeapFloatBuffer.java +++ b/ojluni/src/main/java/java/nio/HeapFloatBuffer.java @@ -159,12 +159,13 @@ class HeapFloatBuffer extends FloatBuffer { } public FloatBuffer put(FloatBuffer src) { + if (src == this) { + throw new IllegalArgumentException(); + } if (isReadOnly) { throw new ReadOnlyBufferException(); } if (src instanceof HeapFloatBuffer) { - if (src == this) - throw new IllegalArgumentException(); HeapFloatBuffer sb = (HeapFloatBuffer) src; int n = sb.remaining(); if (n > remaining()) diff --git a/ojluni/src/main/java/java/nio/HeapIntBuffer.java b/ojluni/src/main/java/java/nio/HeapIntBuffer.java index 642e78237d..b4f3bf7620 100644 --- a/ojluni/src/main/java/java/nio/HeapIntBuffer.java +++ b/ojluni/src/main/java/java/nio/HeapIntBuffer.java @@ -160,12 +160,13 @@ class HeapIntBuffer extends IntBuffer { } public IntBuffer put(IntBuffer src) { + if (src == this) { + throw new IllegalArgumentException(); + } if (isReadOnly) { throw new ReadOnlyBufferException(); } if (src instanceof HeapIntBuffer) { - if (src == this) - throw new IllegalArgumentException(); HeapIntBuffer sb = (HeapIntBuffer) src; int n = sb.remaining(); if (n > remaining()) diff --git a/ojluni/src/main/java/java/nio/HeapLongBuffer.java b/ojluni/src/main/java/java/nio/HeapLongBuffer.java index 60596b001a..c0678b3df1 100644 --- a/ojluni/src/main/java/java/nio/HeapLongBuffer.java +++ b/ojluni/src/main/java/java/nio/HeapLongBuffer.java @@ -161,12 +161,13 @@ class HeapLongBuffer } public LongBuffer put(LongBuffer src) { + if (src == this) { + throw new IllegalArgumentException(); + } if (isReadOnly) { throw new ReadOnlyBufferException(); } if (src instanceof HeapLongBuffer) { - if (src == this) - throw new IllegalArgumentException(); HeapLongBuffer sb = (HeapLongBuffer) src; int n = sb.remaining(); if (n > remaining()) diff --git a/ojluni/src/main/java/java/nio/HeapShortBuffer.java b/ojluni/src/main/java/java/nio/HeapShortBuffer.java index f78f241fbe..af39261d35 100644 --- a/ojluni/src/main/java/java/nio/HeapShortBuffer.java +++ b/ojluni/src/main/java/java/nio/HeapShortBuffer.java @@ -160,12 +160,13 @@ class HeapShortBuffer extends ShortBuffer { } public ShortBuffer put(ShortBuffer src) { + if (src == this) { + throw new IllegalArgumentException(); + } if (isReadOnly) { throw new ReadOnlyBufferException(); } if (src instanceof HeapShortBuffer) { - if (src == this) - throw new IllegalArgumentException(); HeapShortBuffer sb = (HeapShortBuffer)src; int n = sb.remaining(); if (n > remaining()) |