Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit12177c4

Browse files
author
oleksiys
committed
[1.8.x] remove deprecated compression logic
1 parent2de45c4 commit12177c4

File tree

1 file changed

+29
-34
lines changed

1 file changed

+29
-34
lines changed

‎src/main/java/com/ning/http/client/providers/grizzly/GrizzlyAsyncHttpProvider.java‎

Lines changed: 29 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2009,24 +2009,20 @@ public boolean doHandle(final FilterChainContext ctx,
20092009
finalbyte[]data =request.getByteData();
20102010
finalBuffergBuffer =Buffers.wrap(mm,data);
20112011
if (requestPacket.getContentLength() == -1) {
2012-
if (!clientConfig.isCompressionEnabled()) {
2013-
requestPacket.setContentLengthLong(data.length);
2014-
}
2015-
}
2016-
finalHttpContentcontent =requestPacket.httpContentBuilder().content(gBuffer).build();
2017-
content.setLast(true);
2012+
requestPacket.setContentLengthLong(data.length);
2013+
}
2014+
finalHttpContentcontent =requestPacket.httpContentBuilder()
2015+
.content(gBuffer)
2016+
.last(true)
2017+
.build();
20182018
ctx.write(content, ((!requestPacket.isCommitted()) ?ctx.getTransportContext().getCompletionHandler() :null));
20192019
returntrue;
20202020
}
20212021

20222022
@Override
20232023
protectedlonggetContentLength(finalRequestrequest) {
2024-
if (request.getContentLength() >=0) {
2025-
returnrequest.getContentLength();
2026-
}
2027-
2028-
returnclientConfig.isCompressionEnabled()
2029-
? -1
2024+
returnrequest.getContentLength() >=0
2025+
?request.getContentLength()
20302026
:request.getByteData().length;
20312027
}
20322028
}
@@ -2056,12 +2052,12 @@ public boolean doHandle(final FilterChainContext ctx,
20562052
finalMemoryManagermm =ctx.getMemoryManager();
20572053
finalBuffergBuffer =Buffers.wrap(mm,data);
20582054
if (requestPacket.getContentLength() == -1) {
2059-
if (!clientConfig.isCompressionEnabled()) {
2060-
requestPacket.setContentLengthLong(data.length);
2061-
}
2055+
requestPacket.setContentLengthLong(data.length);
20622056
}
2063-
finalHttpContentcontent =requestPacket.httpContentBuilder().content(gBuffer).build();
2064-
content.setLast(true);
2057+
finalHttpContentcontent =requestPacket.httpContentBuilder()
2058+
.content(gBuffer)
2059+
.last(true)
2060+
.build();
20652061
ctx.write(content, ((!requestPacket.isCommitted()) ?ctx.getTransportContext().getCompletionHandler() :null));
20662062
returntrue;
20672063
}
@@ -2116,13 +2112,13 @@ public boolean doHandle(final FilterChainContext ctx,
21162112
finalbyte[]data =sb.toString().getBytes(charset);
21172113
finalMemoryManagermm =ctx.getMemoryManager();
21182114
finalBuffergBuffer =Buffers.wrap(mm,data);
2119-
finalHttpContentcontent =requestPacket.httpContentBuilder().content(gBuffer).build();
2115+
finalHttpContentcontent =requestPacket.httpContentBuilder()
2116+
.content(gBuffer)
2117+
.last(true)
2118+
.build();
21202119
if (requestPacket.getContentLength() == -1) {
2121-
if (!clientConfig.isCompressionEnabled()) {
2122-
requestPacket.setContentLengthLong(data.length);
2123-
}
2120+
requestPacket.setContentLengthLong(data.length);
21242121
}
2125-
content.setLast(true);
21262122
ctx.write(content, ((!requestPacket.isCommitted()) ?ctx.getTransportContext().getCompletionHandler() :null));
21272123
}
21282124
returntrue;
@@ -2154,8 +2150,10 @@ public boolean doHandle(final FilterChainContext ctx,
21542150
b =o.getBuffer();
21552151
b.trim();
21562152
if (b.hasRemaining()) {
2157-
finalHttpContentcontent =requestPacket.httpContentBuilder().content(b).build();
2158-
content.setLast(true);
2153+
finalHttpContentcontent =requestPacket.httpContentBuilder()
2154+
.content(b)
2155+
.last(true)
2156+
.build();
21592157
ctx.write(content, ((!requestPacket.isCommitted()) ?ctx.getTransportContext().getCompletionHandler() :null));
21602158
}
21612159

@@ -2204,9 +2202,11 @@ public boolean doHandle(final FilterChainContext ctx,
22042202
}
22052203
buffer.trim();
22062204
if (buffer.hasRemaining()) {
2207-
finalHttpContentcontent =requestPacket.httpContentBuilder().content(buffer).build();
2205+
finalHttpContentcontent =requestPacket.httpContentBuilder()
2206+
.content(buffer)
2207+
.last(true)
2208+
.build();
22082209
buffer.allowBufferDispose(false);
2209-
content.setLast(true);
22102210
ctx.write(content, ((!requestPacket.isCommitted()) ?ctx.getTransportContext().getCompletionHandler() :null));
22112211
}
22122212

@@ -2306,8 +2306,7 @@ public boolean doHandle(final FilterChainContext ctx,
23062306
finalFilef =request.getFile();
23072307
requestPacket.setContentLengthLong(f.length());
23082308
finalHttpTransactionContextcontext =HttpTransactionContext.get(ctx.getConnection());
2309-
if (clientConfig.isCompressionEnabled() || !SEND_FILE_SUPPORT ||
2310-
requestPacket.isSecure()) {
2309+
if (!SEND_FILE_SUPPORT ||requestPacket.isSecure()) {
23112310

23122311
finalFileInputStreamfis =newFileInputStream(request.getFile());
23132312
finalMemoryManagermm =ctx.getMemoryManager();
@@ -2362,12 +2361,8 @@ public void updated(WriteResult result) {
23622361

23632362
@Override
23642363
protectedlonggetContentLength(finalRequestrequest) {
2365-
if (request.getContentLength() >=0) {
2366-
returnrequest.getContentLength();
2367-
}
2368-
2369-
returnclientConfig.isCompressionEnabled()
2370-
? -1
2364+
returnrequest.getContentLength() >=0
2365+
?request.getContentLength()
23712366
:request.getFile().length();
23722367
}
23732368
}// END FileBodyHandler

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp