Commit88d582e

authored and

committed

Fixed "Sometimes multipart body missed last 1 byte."AsyncHttpClient#1271 and added the testcase. (AsyncHttpClient#1275)

1 parentda4e4af commit88d582eCopy full SHA for 88d582e

File tree

+15

-2

lines changed

src
- main/java/com/ning/http/client/multipart
  - MultipartBody.java
- test/java/com/ning/http/client/multipart
  - MultipartBodyTest.java

+15

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ public long read(ByteBuffer buffer) throws IOException {`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`privatebooleancurrentBytesFullyRead() {`
`186`		`-returncurrentBytes ==null \|\|currentBytesPosition>=currentBytes.length -1;`
	`186`	`+returncurrentBytes ==null \|\|currentBytesPosition== -1;`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`privatevoidinitializeFileBody(AbstractFilePartpart)throwsIOException {`

Lines changed: 14 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,16 @@ public void transferWithCopy() throws IOException {`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
	`43`	`+@Test`
	`44`	`+publicvoidtransferWithCopy2()throwsIOException {`
	`45`	`+try (finalMultipartBodymultipartBody =buildMultipart()) {`
	`46`	`+finallongcontentLength =multipartBody.getContentLength();`
	`47`	`+finalintbufferSize = (int)contentLength -1;`
	`48`	`+finallongtranferred =transferWithCopy(multipartBody,bufferSize);`
	`49`	`+Assert.assertEquals(tranferred,contentLength);`
	`50`	`+ }`
	`51`	`+ }`
	`52`	`+`
`43`	`53`	`@Test`
`44`	`54`	`publicvoidtransferZeroCopy()throwsIOException {`
`45`	`55`	`try (MultipartBodymultipartBody =buildMultipart()) {`
`@@ -70,8 +80,11 @@ private static File getTestfile() {`
`70`	`80`	`}`
`71`	`81`
`72`	`82`	`privatestaticlongtransferWithCopy(MultipartBodymultipartBody)throwsIOException {`
	`83`	`+returntransferWithCopy(multipartBody,8192);`
	`84`	`+ }`
`73`	`85`
`74`		`-finalByteBufferbuffer =ByteBuffer.allocate(8192);`
	`86`	`+privatestaticlongtransferWithCopy(MultipartBodymultipartBody,intbufferSize)throwsIOException {`
	`87`	`+finalByteBufferbuffer =ByteBuffer.allocate(bufferSize);`
`75`	`88`	`longtotalBytes =0;`
`76`	`89`	`while (true) {`
`77`	`90`	`longreadBytes =multipartBody.read(buffer);`

Comments

(0)