Commite43da76

committed

NettyReactiveStreamsBody shouldn't assume ByteBuffer has an array without offset and partial length

1 parent3abe37b commite43da76Copy full SHA for e43da76

File tree

-8

lines changed

client/src
- main/java/org/asynchttpclient/netty/request/body
  - NettyReactiveStreamsBody.java
- test/java/org/asynchttpclient/reactivestreams
  - ReactiveStreamsTest.java

-8

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public void onSubscribe(Subscription s) {`
`81`	`81`	`}`
`82`	`82`	`@Override`
`83`	`83`	`publicvoidonNext(ByteBuffert) {`
`84`		`-ByteBufbuffer =Unpooled.wrappedBuffer(t.array());`
	`84`	`+ByteBufbuffer =Unpooled.wrappedBuffer(t);`
`85`	`85`	`HttpContentcontent =newDefaultHttpContent(buffer);`
`86`	`86`	`subscriber.onNext(content);`
`87`	`87`	`}`

Lines changed: 6 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,16 +12,15 @@`
`12`	`12`	`*/`
`13`	`13`	`packageorg.asynchttpclient.reactivestreams;`
`14`	`14`
`15`		`-importstaticorg.asynchttpclient.Dsl.*;`
`16`		`-importstaticorg.asynchttpclient.test.TestUtils.*;`
`17`	`15`	`importstaticio.netty.handler.codec.http.HttpHeaderNames.*;`
	`16`	`+importstaticorg.asynchttpclient.Dsl.*;`
	`17`	`+importstaticorg.asynchttpclient.test.TestUtils.LARGE_IMAGE_BYTES;`
`18`	`18`	`importstaticorg.testng.Assert.assertEquals;`
`19`	`19`	`importio.netty.handler.codec.http.HttpHeaders;`
`20`	`20`
`21`	`21`	`importjava.io.ByteArrayOutputStream;`
`22`	`22`	`importjava.nio.ByteBuffer;`
`23`	`23`	`importjava.util.ArrayList;`
`24`		`-importjava.util.Arrays;`
`25`	`24`	`importjava.util.Collections;`
`26`	`25`	`importjava.util.Iterator;`
`27`	`26`	`importjava.util.List;`
`@@ -359,10 +358,10 @@ public boolean hasNext() {`
`359`	`358`
`360`	`359`	`@Override`
`361`	`360`	`publicByteBuffernext() {`
`362`		`-intnewIndex =Math.min(currentIndex +chunkSize,payload.length);`
`363`		`-byte[]bytesInElement =Arrays.copyOfRange(payload,currentIndex,newIndex);`
`364`		`-currentIndex=newIndex;`
`365`		`-returnByteBuffer.wrap(bytesInElement);`
	`361`	`+intthisCurrentIndex =currentIndex;`
	`362`	`+intlength =Math.min(chunkSize,payload.length -thisCurrentIndex);`
	`363`	`+currentIndex+=length;`
	`364`	`+returnByteBuffer.wrap(payload,thisCurrentIndex,length);`
`366`	`365`	`}`
`367`	`366`
`368`	`367`	`@Override`

Comments

(0)