Merge branch '5.1.x'

2019-03-04 13:58:41 +01:00
parent 45b6c0fcb5 090aceb3ad
commit 3ac1dddb9d
2 changed files with 23 additions and 2 deletions
--- a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBuffer.java
+++ b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBuffer.java
@@ -264,13 +264,13 @@ public interface DataBuffer {
 					break;
 				}
 				if (cr.isOverflow()) {
-					writePosition(outBuffer.position());
+					writePosition(writePosition() + outBuffer.position());
 					int maximumSize = (int) (inBuffer.remaining() * charsetEncoder.maxBytesPerChar());
 					ensureCapacity(maximumSize);
 					outBuffer = asByteBuffer(writePosition(), writableByteCount());
 				}
 			}
-			writePosition(outBuffer.position());
+			writePosition(writePosition() + outBuffer.position());
 		}
 		return this;
 	}