Skip to content

Commit b9f7eda

Browse files
author
oleksiys
committed
[1.9.x] remove deprecated compression logic
1 parent 117a43b commit b9f7eda

File tree

1 file changed

+24
-30
lines changed

1 file changed

+24
-30
lines changed

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

Lines changed: 24 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1417,7 +1417,6 @@ protected boolean onHttpHeaderParsed(final HttpHeader httpHeader,
14171417
return false;
14181418
}
14191419

1420-
14211420
@SuppressWarnings({"unchecked"})
14221421
@Override
14231422
protected boolean onHttpPacketParsed(HttpHeader httpHeader, FilterChainContext ctx) {
@@ -1922,24 +1921,20 @@ public boolean doHandle(final FilterChainContext ctx,
19221921
final byte[] data = request.getByteData();
19231922
final Buffer gBuffer = Buffers.wrap(mm, data);
19241923
if (requestPacket.getContentLength() == -1) {
1925-
if (!clientConfig.isCompressionEnforced()) {
1926-
requestPacket.setContentLengthLong(data.length);
1927-
}
1924+
requestPacket.setContentLengthLong(data.length);
19281925
}
1929-
final HttpContent content = requestPacket.httpContentBuilder().content(gBuffer).build();
1930-
content.setLast(true);
1926+
final HttpContent content = requestPacket.httpContentBuilder()
1927+
.content(gBuffer)
1928+
.last(true)
1929+
.build();
19311930
ctx.write(content, ((!requestPacket.isCommitted()) ? ctx.getTransportContext().getCompletionHandler() : null));
19321931
return true;
19331932
}
19341933

19351934
@Override
19361935
protected long getContentLength(final Request request) {
1937-
if (request.getContentLength() >= 0) {
1938-
return request.getContentLength();
1939-
}
1940-
1941-
return clientConfig.isCompressionEnforced()
1942-
? -1
1936+
return request.getContentLength() >= 0
1937+
? request.getContentLength()
19431938
: request.getByteData().length;
19441939
}
19451940
}
@@ -1969,12 +1964,12 @@ public boolean doHandle(final FilterChainContext ctx,
19691964
final MemoryManager mm = ctx.getMemoryManager();
19701965
final Buffer gBuffer = Buffers.wrap(mm, data);
19711966
if (requestPacket.getContentLength() == -1) {
1972-
if (!clientConfig.isCompressionEnforced()) {
1973-
requestPacket.setContentLengthLong(data.length);
1974-
}
1967+
requestPacket.setContentLengthLong(data.length);
19751968
}
1976-
final HttpContent content = requestPacket.httpContentBuilder().content(gBuffer).build();
1977-
content.setLast(true);
1969+
final HttpContent content = requestPacket.httpContentBuilder()
1970+
.content(gBuffer)
1971+
.last(true)
1972+
.build();
19781973
ctx.write(content, ((!requestPacket.isCommitted()) ? ctx.getTransportContext().getCompletionHandler() : null));
19791974
return true;
19801975
}
@@ -2017,11 +2012,13 @@ public boolean doHandle(final FilterChainContext ctx,
20172012
final byte[] data = sb.toString().getBytes(charset);
20182013
final MemoryManager mm = ctx.getMemoryManager();
20192014
final Buffer gBuffer = Buffers.wrap(mm, data);
2020-
final HttpContent content = requestPacket.httpContentBuilder().content(gBuffer).build();
2021-
if (requestPacket.getContentLength() == -1 && !clientConfig.isCompressionEnforced()) {
2015+
final HttpContent content = requestPacket.httpContentBuilder()
2016+
.content(gBuffer)
2017+
.last(true)
2018+
.build();
2019+
if (requestPacket.getContentLength() == -1) {
20222020
requestPacket.setContentLengthLong(data.length);
20232021
}
2024-
content.setLast(true);
20252022
ctx.write(content, ((!requestPacket.isCommitted()) ? ctx.getTransportContext().getCompletionHandler() : null));
20262023
}
20272024

@@ -2069,9 +2066,11 @@ public boolean doHandle(final FilterChainContext ctx,
20692066
}
20702067
buffer.trim();
20712068
if (buffer.hasRemaining()) {
2072-
final HttpContent content = requestPacket.httpContentBuilder().content(buffer).build();
2069+
final HttpContent content = requestPacket.httpContentBuilder()
2070+
.content(buffer)
2071+
.last(true)
2072+
.build();
20732073
buffer.allowBufferDispose(false);
2074-
content.setLast(true);
20752074
ctx.write(content, ((!requestPacket.isCommitted()) ? ctx.getTransportContext().getCompletionHandler() : null));
20762075
}
20772076

@@ -2171,8 +2170,7 @@ public boolean doHandle(final FilterChainContext ctx,
21712170
final File f = request.getFile();
21722171
requestPacket.setContentLengthLong(f.length());
21732172
final HttpTransactionContext context = HttpTransactionContext.get(ctx.getConnection());
2174-
if (clientConfig.isCompressionEnforced() || !SEND_FILE_SUPPORT ||
2175-
requestPacket.isSecure()) {
2173+
if (!SEND_FILE_SUPPORT || requestPacket.isSecure()) {
21762174

21772175
final FileInputStream fis = new FileInputStream(request.getFile());
21782176
final MemoryManager mm = ctx.getMemoryManager();
@@ -2227,12 +2225,8 @@ public void updated(WriteResult result) {
22272225

22282226
@Override
22292227
protected long getContentLength(final Request request) {
2230-
if (request.getContentLength() >= 0) {
2231-
return request.getContentLength();
2232-
}
2233-
2234-
return clientConfig.isCompressionEnforced()
2235-
? -1
2228+
return request.getContentLength() >= 0
2229+
? request.getContentLength()
22362230
: request.getFile().length();
22372231
}
22382232
} // END FileBodyHandler

0 commit comments

Comments
 (0)