Bug fix: Simple response consumer to discard stored content when releasing resources

This commit is contained in:
Oleg Kalnichevski 2019-03-07 08:47:29 +01:00
parent 39023dfed1
commit d950fa6ed0
2 changed files with 81 additions and 2 deletions

View File

@ -0,0 +1,80 @@
/*
* ====================================================================
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
*/
package org.apache.hc.client5.http.async.methods;
import java.io.IOException;
import java.nio.ByteBuffer;
import org.apache.hc.core5.http.ContentType;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.nio.entity.AbstractBinAsyncEntityConsumer;
import org.apache.hc.core5.util.ByteArrayBuffer;
final class SimpleAsyncEntityConsumer extends AbstractBinAsyncEntityConsumer<byte[]> {
private final ByteArrayBuffer buffer;
public SimpleAsyncEntityConsumer() {
super();
this.buffer = new ByteArrayBuffer(1024);
}
@Override
protected void streamStart(final ContentType contentType) throws HttpException, IOException {
}
@Override
protected int capacityIncrement() {
return Integer.MAX_VALUE;
}
@Override
protected void data(final ByteBuffer src, final boolean endOfStream) throws IOException {
if (src == null) {
return;
}
if (src.hasArray()) {
buffer.append(src.array(), src.arrayOffset() + src.position(), src.remaining());
} else {
while (src.hasRemaining()) {
buffer.append(src.get());
}
}
}
@Override
protected byte[] generateContent() throws IOException {
return buffer.toByteArray();
}
@Override
public void releaseResources() {
buffer.clear();
}
}

View File

@ -32,7 +32,6 @@ import org.apache.hc.core5.http.ContentType;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.nio.AsyncEntityConsumer;
import org.apache.hc.core5.http.nio.entity.BasicAsyncEntityConsumer;
import org.apache.hc.core5.http.nio.support.AbstractAsyncResponseConsumer;
import org.apache.hc.core5.http.protocol.HttpContext;
@ -51,7 +50,7 @@ public final class SimpleResponseConsumer extends AbstractAsyncResponseConsumer<
}
public static SimpleResponseConsumer create() {
return new SimpleResponseConsumer(new BasicAsyncEntityConsumer());
return new SimpleResponseConsumer(new SimpleAsyncEntityConsumer());
}
@Override