changeset 5392:019c69143daf

8000178: (bf) Backout 7190219 fix for jdk7u (JCK issue) Reviewed-by: alanb, luchsh
author coffeys
date Thu, 25 Oct 2012 19:01:26 +0100
parents 93019cb32514
children 5858aefd7398 53fc48ac178f
files src/share/classes/java/nio/X-Buffer.java.template test/java/nio/Buffer/Basic-X.java.template test/java/nio/Buffer/Basic.java test/java/nio/Buffer/BasicByte.java test/java/nio/Buffer/BasicChar.java test/java/nio/Buffer/BasicDouble.java test/java/nio/Buffer/BasicFloat.java test/java/nio/Buffer/BasicInt.java test/java/nio/Buffer/BasicLong.java test/java/nio/Buffer/BasicShort.java
diffstat 10 files changed, 1 insertions(+), 107 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/java/nio/X-Buffer.java.template	Thu Oct 25 21:07:31 2012 +0400
+++ b/src/share/classes/java/nio/X-Buffer.java.template	Thu Oct 25 19:01:26 2012 +0100
@@ -888,8 +888,6 @@
      */
     public $Type$Buffer put(String src, int start, int end) {
         checkBounds(start, end - start, src.length());
-        if (end - start > remaining())
-            throw new BufferOverflowException();
         for (int i = start; i < end; i++)
             this.put(src.charAt(i));
         return this;
--- a/test/java/nio/Buffer/Basic-X.java.template	Thu Oct 25 21:07:31 2012 +0400
+++ b/test/java/nio/Buffer/Basic-X.java.template	Thu Oct 25 19:01:26 2012 +0100
@@ -402,19 +402,6 @@
         ck(b, b.charAt(1), 'f');
         ck(b, b.subSequence(1, 3).toString().equals("fg"));
 
-        // String ops
-
-        // 7190219
-        b.clear();
-        int pos = b.position();
-        tryCatch(b, BufferOverflowException.class, new Runnable() {
-            public void run() {
-                b.put(String.valueOf(new char[b.capacity() + 1]), 0,
-                        b.capacity() + 1);
-            }});
-        ck(b, b.position(), pos);
-        relGet(b);
-
 #end[char]
 
         // Compact
--- a/test/java/nio/Buffer/Basic.java	Thu Oct 25 21:07:31 2012 +0400
+++ b/test/java/nio/Buffer/Basic.java	Thu Oct 25 19:01:26 2012 +0100
@@ -25,7 +25,7 @@
  * @summary Unit test for buffers
  * @bug 4413135 4414911 4416536 4416562 4418782 4471053 4472779 4490253 4523725
  *      4526177 4463011 4660660 4661219 4663521 4782970 4804304 4938424 6231529
- *      6221101 6234263 6535542 6591971 6593946 6795561 7190219
+ *      6221101 6234263 6535542 6591971 6593946 6795561
  * @author Mark Reinhold
  */
 
--- a/test/java/nio/Buffer/BasicByte.java	Thu Oct 25 21:07:31 2012 +0400
+++ b/test/java/nio/Buffer/BasicByte.java	Thu Oct 25 19:01:26 2012 +0100
@@ -404,19 +404,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
         // Compact
 
         relPut(b);
--- a/test/java/nio/Buffer/BasicChar.java	Thu Oct 25 21:07:31 2012 +0400
+++ b/test/java/nio/Buffer/BasicChar.java	Thu Oct 25 19:01:26 2012 +0100
@@ -402,19 +402,6 @@
         ck(b, b.charAt(1), 'f');
         ck(b, b.subSequence(1, 3).toString().equals("fg"));
 
-        // String ops
-
-        // 7190219
-        b.clear();
-        int pos = b.position();
-        tryCatch(b, BufferOverflowException.class, new Runnable() {
-            public void run() {
-                b.put(String.valueOf(new char[b.capacity() + 1]), 0,
-                        b.capacity() + 1);
-            }});
-        ck(b, b.position(), pos);
-        relGet(b);
-
 
 
         // Compact
--- a/test/java/nio/Buffer/BasicDouble.java	Thu Oct 25 21:07:31 2012 +0400
+++ b/test/java/nio/Buffer/BasicDouble.java	Thu Oct 25 19:01:26 2012 +0100
@@ -404,19 +404,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
         // Compact
 
         relPut(b);
--- a/test/java/nio/Buffer/BasicFloat.java	Thu Oct 25 21:07:31 2012 +0400
+++ b/test/java/nio/Buffer/BasicFloat.java	Thu Oct 25 19:01:26 2012 +0100
@@ -404,19 +404,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
         // Compact
 
         relPut(b);
--- a/test/java/nio/Buffer/BasicInt.java	Thu Oct 25 21:07:31 2012 +0400
+++ b/test/java/nio/Buffer/BasicInt.java	Thu Oct 25 19:01:26 2012 +0100
@@ -404,19 +404,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
         // Compact
 
         relPut(b);
--- a/test/java/nio/Buffer/BasicLong.java	Thu Oct 25 21:07:31 2012 +0400
+++ b/test/java/nio/Buffer/BasicLong.java	Thu Oct 25 19:01:26 2012 +0100
@@ -404,19 +404,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
         // Compact
 
         relPut(b);
--- a/test/java/nio/Buffer/BasicShort.java	Thu Oct 25 21:07:31 2012 +0400
+++ b/test/java/nio/Buffer/BasicShort.java	Thu Oct 25 19:01:26 2012 +0100
@@ -404,19 +404,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
         // Compact
 
         relPut(b);