Index: SimpleDataOutput.java
===================================================================
--- SimpleDataOutput.java	(revision 231625)
+++ SimpleDataOutput.java	(working copy)
@@ -82,7 +82,7 @@
             final byte[] buffer = this.buffer;
             final int position = this.position;
             if (position == buffer.length) {
-                flush();
+                shallowFlush();
                 buffer[0] = (byte) v;
                 this.position = 1;
             } else {
@@ -104,7 +104,7 @@
         final int bl = buffer.length;
         final int position = this.position;
         if (len > bl - position || len > bl >> 3) {
-            flush();
+            shallowFlush();
             byteOutput.write(bytes, off, len);
         } else {
             System.arraycopy(bytes, off, buffer, position, len);
@@ -118,7 +118,7 @@
             final byte[] buffer = this.buffer;
             final int remaining = buffer.length - position;
             if (remaining == 0) {
-                flush();
+                shallowFlush();
                 buffer[0] = (byte) (v ? 1 : 0);
                 position = 1;
             } else {
@@ -135,7 +135,7 @@
             final byte[] buffer = this.buffer;
             final int remaining = buffer.length - position;
             if (remaining == 0) {
-                flush();
+                shallowFlush();
                 buffer[0] = (byte) v;
                 position = 1;
             } else {
@@ -152,7 +152,7 @@
             final byte[] buffer = this.buffer;
             final int remaining = buffer.length - position;
             if (remaining < 2) {
-                flush();
+                shallowFlush();
                 buffer[0] = (byte) (v >> 8);
                 buffer[1] = (byte) v;
                 position = 2;
@@ -173,7 +173,7 @@
             final byte[] buffer = this.buffer;
             final int remaining = buffer.length - position;
             if (remaining < 2) {
-                flush();
+                shallowFlush();
                 buffer[0] = (byte) (v >> 8);
                 buffer[1] = (byte) v;
                 position = 2;
@@ -194,7 +194,7 @@
             final byte[] buffer = this.buffer;
             final int remaining = buffer.length - position;
             if (remaining < 4) {
-                flush();
+                shallowFlush();
                 buffer[0] = (byte) (v >> 24);
                 buffer[1] = (byte) (v >> 16);
                 buffer[2] = (byte) (v >> 8);
@@ -219,7 +219,7 @@
             final byte[] buffer = this.buffer;
             final int remaining = buffer.length - position;
             if (remaining < 8) {
-                flush();
+                shallowFlush();
                 buffer[0] = (byte) (v >> 56L);
                 buffer[1] = (byte) (v >> 48L);
                 buffer[2] = (byte) (v >> 40L);
@@ -253,7 +253,7 @@
             final byte[] buffer = this.buffer;
             final int remaining = buffer.length - position;
             if (remaining < 4) {
-                flush();
+                shallowFlush();
                 buffer[0] = (byte) (bits >> 24);
                 buffer[1] = (byte) (bits >> 16);
                 buffer[2] = (byte) (bits >> 8);
@@ -278,7 +278,7 @@
         try {
             final int remaining = buffer.length - position;
             if (remaining < 8) {
-                flush();
+                shallowFlush();
                 buffer[0] = (byte) (bits >> 56L);
                 buffer[1] = (byte) (bits >> 48L);
                 buffer[2] = (byte) (bits >> 40L);