Commit50aeda0

committed

File part is missing from transferred bytes sum,closeAsyncHttpClient#1126

1 parent5b51e2e commit50aeda0Copy full SHA for 50aeda0

File tree

2 files changed

+10

-9

lines changed

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

2 files changed

+10

-9

lines changed

`‎src/main/java/com/ning/http/client/multipart/FilePart.java‎`

Lines changed: 9 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -108,21 +108,21 @@ public long write(WritableByteChannel target, byte[] boundary) throws IOExceptio`
`108`	`108`	`RandomAccessFileraf =newRandomAccessFile(file,"r");`
`109`	`109`	`FileChannelfc =raf.getChannel();`
`110`	`110`
`111`		`-longl =file.length();`
`112`		`-intfileLength =0;`
`113`		`-longnWrite =0;`
	`111`	`+longactualFileLength =file.length();`
	`112`	`+longtransferredFileBytes =0;`
`114`	`113`	`// FIXME why sync?`
`115`	`114`	`try {`
`116`	`115`	`synchronized (fc) {`
`117`		`-while (fileLength !=l) {`
	`116`	`+while (transferredFileBytes !=actualFileLength) {`
	`117`	`+longwritten =0;`
	`118`	`+`
`118`	`119`	`if (handler.isFailed()) {`
`119`	`120`	`LOGGER.debug("Stalled error");`
`120`	`121`	`thrownewFileUploadStalledException();`
`121`	`122`	`}`
`122`	`123`	`try {`
`123`		`-nWrite =fc.transferTo(fileLength,l,target);`
`124`		`-`
`125`		`-if (nWrite ==0) {`
	`124`	`+written =fc.transferTo(transferredFileBytes,actualFileLength,target);`
	`125`	`+if (written ==0) {`
`126`	`126`	`LOGGER.info("Waiting for writing...");`
`127`	`127`	`try {`
`128`	`128`	`fc.wait(50);`
`@@ -148,14 +148,15 @@ public long write(WritableByteChannel target, byte[] boundary) throws IOExceptio`
`148`	`148`	`throwex;`
`149`	`149`	`}`
`150`	`150`	`}`
`151`		`-fileLength +=nWrite;`
	`151`	`+transferredFileBytes +=written;`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`	`}finally {`
`155`	`155`	`handler.completed();`
`156`	`156`	`raf.close();`
`157`	`157`	`}`
`158`	`158`
	`159`	`+length +=transferredFileBytes;`
`159`	`160`	`length +=MultipartUtils.writeBytesToChannel(target,generateFileEnd());`
`160`	`161`
`161`	`162`	`returnlength;`

`‎src/main/java/com/ning/http/client/multipart/MultipartBody.java‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public byte[] getBoundary() {`
`77`	`77`	`publiclongtransferTo(longposition,WritableByteChanneltarget)throwsIOException {`
`78`	`78`
`79`	`79`	`if (transfertDone) {`
`80`		`-return -1;`
	`80`	`+thrownewUnsupportedOperationException("Transfer is already done");`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`longoverallLength =0;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit50aeda0

File tree

2 files changed

2 files changed

`‎src/main/java/com/ning/http/client/multipart/FilePart.java‎`

`‎src/main/java/com/ning/http/client/multipart/MultipartBody.java‎`

0 commit comments