auto import from //branches/cupcake/...@126645

3 files changed, 7 insertions, 27 deletions

diff --git a/nio/src/main/java/java/nio/Buffer.java b/nio/src/main/java/java/nio/Buffer.java
index 844d2ce..9e870e4 100644
--- a/nio/src/main/java/java/nio/Buffer.java
+++ b/nio/src/main/java/java/nio/Buffer.java
@@ -150,21 +150,11 @@ public abstract class Buffer {
      * @since Android 1.0
      */
     public final Buffer clear() {
-        // BEGIN android-changed
-        internalClear();
-        // END android-changed
-        return this;
-    }
-
-    // BEGIN android-added
-    // We need a possibility to change the behavior of clear in some optimized
-    // DirectByteBuffer adapters.
-    void internalClear() {
         position = 0;
         mark = UNSET_MARK;
         limit = capacity;
+        return this;
     }
-    // END android-added
 
     /**
      * Flips this buffer.
diff --git a/nio/src/main/java/java/nio/IntToByteBufferAdapter.java b/nio/src/main/java/java/nio/IntToByteBufferAdapter.java
index e52f6b6..91b9311 100644
--- a/nio/src/main/java/java/nio/IntToByteBufferAdapter.java
+++ b/nio/src/main/java/java/nio/IntToByteBufferAdapter.java
@@ -194,8 +194,11 @@ final class IntToByteBufferAdapter extends IntBuffer implements DirectBuffer {
     }
 
     // BEGIN android-added
+    @Override
     public IntBuffer put(int[] i, int off, int len) {
         if (byteBuffer instanceof ReadWriteDirectByteBuffer) {
+            byteBuffer.limit(limit << 2);
+            byteBuffer.position(position << 2);
             ((ReadWriteDirectByteBuffer) byteBuffer).put(i, off, len);
             this.position += len;
             return this;
@@ -203,14 +206,6 @@ final class IntToByteBufferAdapter extends IntBuffer implements DirectBuffer {
             return super.put(i, off, len);
         }
     }
-    
-    @Override
-    void internalClear() {
-        if (byteBuffer instanceof ReadWriteDirectByteBuffer) {
-            byteBuffer.clear();
-        }
-        super.internalClear();
-    }
     // END android-added
 
     public IntBuffer slice() {
diff --git a/nio/src/main/java/java/nio/ShortToByteBufferAdapter.java b/nio/src/main/java/java/nio/ShortToByteBufferAdapter.java
index fe4fff4..41ce50c 100644
--- a/nio/src/main/java/java/nio/ShortToByteBufferAdapter.java
+++ b/nio/src/main/java/java/nio/ShortToByteBufferAdapter.java
@@ -194,8 +194,11 @@ final class ShortToByteBufferAdapter extends ShortBuffer implements DirectBuffer
     }
     
     // BEGIN android-added
+    @Override
     public ShortBuffer put(short[] s, int off, int len) {
         if (byteBuffer instanceof ReadWriteDirectByteBuffer) {
+            byteBuffer.limit(limit << 1);
+            byteBuffer.position(position << 1);
             ((ReadWriteDirectByteBuffer) byteBuffer).put(s, off, len);
             this.position += len;
             return this;
@@ -203,14 +206,6 @@ final class ShortToByteBufferAdapter extends ShortBuffer implements DirectBuffer
             return super.put(s, off, len);
         }
     }
-    
-    @Override
-    void internalClear() {
-        if (byteBuffer instanceof ReadWriteDirectByteBuffer) {
-            byteBuffer.clear();
-        }
-        super.internalClear();
-    }
     // END android-added
 
     public ShortBuffer slice() {