Commit5df3898

committed

Fix decodeNonOptimized,closeAsyncHttpClient#1305

1 parentbd263b2 commit5df3898Copy full SHA for 5df3898

File tree

-9

lines changed

-9

lines changed

Lines changed: 7 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`
`16`	`16`	`importstaticjava.nio.charset.StandardCharsets.*;`
`17`	`17`	`importio.netty.buffer.ByteBuf;`
`18`		`-importio.netty.buffer.CompositeByteBuf;`
`19`	`18`	`importio.netty.buffer.Unpooled;`
`20`	`19`
`21`	`20`	`importjava.nio.charset.CharacterCodingException;`
`@@ -35,22 +34,21 @@ public static String byteBuf2String(Charset charset, ByteBuf buf) throws Charact`
`35`	`34`	`}`
`36`	`35`
`37`	`36`	`publicstaticStringdecodeNonOptimized(Charsetcharset,ByteBuf...bufs) {`
`38`		`-`
`39`		`-CompositeByteBufcomposite =Unpooled.compositeBuffer(bufs.length);`
`40`	`37`
`41`		`-try {`
`42`		`-for (ByteBufbuf :bufs) {`
`43`		`-buf.retain();`
`44`		`-composite.addComponent(buf);`
`45`		`- }`
	`38`	`+for (ByteBufbuf :bufs) {`
	`39`	`+buf.retain();`
	`40`	`+ }`
`46`	`41`
	`42`	`+ByteBufcomposite =Unpooled.wrappedBuffer(bufs);`
	`43`	`+`
	`44`	`+try {`
`47`	`45`	`returncomposite.toString(charset);`
`48`	`46`
`49`	`47`	`}finally {`
`50`	`48`	`composite.release();`
`51`	`49`	`}`
`52`	`50`	`}`
`53`		`-`
	`51`	`+`
`54`	`52`	`publicstaticStringbyteBuf2String(Charsetcharset,ByteBuf...bufs)throwsCharacterCodingException {`
`55`	`53`	`if (charset.equals(UTF_8) \|\|charset.equals(US_ASCII)) {`
`56`	`54`	`returnUtf8ByteBufCharsetDecoder.decodeUtf8(bufs);`

Comments

(0)