avoid flush repeatedly when has finished flushing (#839)

* avoid repeat flush when position finish * Formatting Co-authored-by: jerry.l <jerry.l@binance.com> Co-authored-by: Thomas Heigl <thomas.heigl@gmail.com>
EsotericSoftware · Jul 6, 2021 · ca876f6 · ca876f6
1 parent 85015b8
commit ca876f6
Showing 1 changed file with 107 additions and 106 deletions.
diff --git a/src/com/esotericsoftware/kryo/io/OutputChunked.java b/src/com/esotericsoftware/kryo/io/OutputChunked.java
@@ -1,106 +1,107 @@
-/* Copyright (c) 2008-2020, Nathan Sweet
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
- * conditions are met:
- * 
- * - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the distribution.
- * - Neither the name of Esoteric Software nor the names of its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
- * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
-
-package com.esotericsoftware.kryo.io;
-
-import static com.esotericsoftware.kryo.util.Util.*;
-import static com.esotericsoftware.minlog.Log.*;
-
-import com.esotericsoftware.kryo.KryoException;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-/** An {@link Output} that writes the length before each flush. The length allows the chunks to be skipped when reading.
- * @author Nathan Sweet */
-public class OutputChunked extends Output {
-	/** @see Output#Output() */
-	public OutputChunked () {
-		super();
-	}
-
-	/** @see Output#Output(int) */
-	public OutputChunked (int bufferSize) {
-		super(bufferSize);
-	}
-
-	/** @see Output#Output(OutputStream) */
-	public OutputChunked (OutputStream outputStream) {
-		super(outputStream);
-	}
-
-	/** @see Output#Output(OutputStream, int) */
-	public OutputChunked (OutputStream outputStream, int bufferSize) {
-		super(outputStream, bufferSize);
-	}
-
-	public void flush () throws KryoException {
-		if (position() > 0) {
-			try {
-				writeChunkSize();
-				super.flush();
-			} catch (IOException ex) {
-				throw new KryoException(ex);
-			}
-		}
-		super.flush();
-	}
-
-	private void writeChunkSize () throws IOException {
-		int size = position();
-		if (TRACE) trace("kryo", "Write chunk: " + size + pos(size));
-		OutputStream outputStream = getOutputStream();
-		if ((size & ~0x7F) == 0) {
-			outputStream.write(size);
-			return;
-		}
-		outputStream.write((size & 0x7F) | 0x80);
-		size >>>= 7;
-		if ((size & ~0x7F) == 0) {
-			outputStream.write(size);
-			return;
-		}
-		outputStream.write((size & 0x7F) | 0x80);
-		size >>>= 7;
-		if ((size & ~0x7F) == 0) {
-			outputStream.write(size);
-			return;
-		}
-		outputStream.write((size & 0x7F) | 0x80);
-		size >>>= 7;
-		if ((size & ~0x7F) == 0) {
-			outputStream.write(size);
-			return;
-		}
-		outputStream.write((size & 0x7F) | 0x80);
-		size >>>= 7;
-		outputStream.write(size);
-	}
-
-	/** Marks the curent written data as the end of a chunk. This chunk can then be skipped when reading. */
-	public void endChunk () {
-		flush();
-		if (TRACE) trace("kryo", "End chunk.");
-		try {
-			getOutputStream().write(0); // Zero length chunk.
-		} catch (IOException ex) {
-			throw new KryoException(ex);
-		}
-	}
-}
+/* Copyright (c) 2008-2020, Nathan Sweet
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
+ * conditions are met:
+ * 
+ * - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the distribution.
+ * - Neither the name of Esoteric Software nor the names of its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+
+package com.esotericsoftware.kryo.io;
+
+import static com.esotericsoftware.kryo.util.Util.*;
+import static com.esotericsoftware.minlog.Log.*;
+
+import com.esotericsoftware.kryo.KryoException;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+/** An {@link Output} that writes the length before each flush. The length allows the chunks to be skipped when reading.
+ * @author Nathan Sweet */
+public class OutputChunked extends Output {
+	/** @see Output#Output() */
+	public OutputChunked () {
+		super();
+	}
+
+	/** @see Output#Output(int) */
+	public OutputChunked (int bufferSize) {
+		super(bufferSize);
+	}
+
+	/** @see Output#Output(OutputStream) */
+	public OutputChunked (OutputStream outputStream) {
+		super(outputStream);
+	}
+
+	/** @see Output#Output(OutputStream, int) */
+	public OutputChunked (OutputStream outputStream, int bufferSize) {
+		super(outputStream, bufferSize);
+	}
+
+	public void flush () throws KryoException {
+		if (position() > 0) {
+			try {
+				writeChunkSize();
+				super.flush();
+			} catch (IOException ex) {
+				throw new KryoException(ex);
+			}
+		} else {
+			super.flush();
+		}
+	}
+
+	private void writeChunkSize () throws IOException {
+		int size = position();
+		if (TRACE) trace("kryo", "Write chunk: " + size + pos(size));
+		OutputStream outputStream = getOutputStream();
+		if ((size & ~0x7F) == 0) {
+			outputStream.write(size);
+			return;
+		}
+		outputStream.write((size & 0x7F) | 0x80);
+		size >>>= 7;
+		if ((size & ~0x7F) == 0) {
+			outputStream.write(size);
+			return;
+		}
+		outputStream.write((size & 0x7F) | 0x80);
+		size >>>= 7;
+		if ((size & ~0x7F) == 0) {
+			outputStream.write(size);
+			return;
+		}
+		outputStream.write((size & 0x7F) | 0x80);
+		size >>>= 7;
+		if ((size & ~0x7F) == 0) {
+			outputStream.write(size);
+			return;
+		}
+		outputStream.write((size & 0x7F) | 0x80);
+		size >>>= 7;
+		outputStream.write(size);
+	}
+
+	/** Marks the current written data as the end of a chunk. This chunk can then be skipped when reading. */
+	public void endChunk () {
+		flush();
+		if (TRACE) trace("kryo", "End chunk.");
+		try {
+			getOutputStream().write(0); // Zero length chunk.
+		} catch (IOException ex) {
+			throw new KryoException(ex);
+		}
+	}
+}