Skip to content

Commit

Permalink
[CXF-9059] HttpConduit should flush output stream (#2069)
Browse files Browse the repository at this point in the history
* [CXF-9059] HttpConduit should flush output stream ahead of closing connections when HttpClient is autocloseable

* Move code to HttpClientHttpConduit

* [CXF-9059] Update impl to handle flush IOException

(cherry picked from commit e7cf74c)
(cherry picked from commit f8a8a64)
  • Loading branch information
jgoodyear authored and reta committed Sep 21, 2024
1 parent 6c63af5 commit 20ca33d
Show file tree
Hide file tree
Showing 2 changed files with 87 additions and 78 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -168,29 +168,29 @@ public abstract class HTTPConduit
public static final String NO_IO_EXCEPTIONS = "org.apache.cxf.transport.no_io_exceptions";
public static final String FORCE_HTTP_VERSION = "org.apache.cxf.transport.http.forceVersion";

/**
* The HTTP status codes as contextual property (comma-separated integers as String)
* on the outgoing {@link Message} which lead to setting {@code org.apache.cxf.transport.service_not_available}
* for all responses with those status codes. This is used e.g. by the
/**
* The HTTP status codes as contextual property (comma-separated integers as String)
* on the outgoing {@link Message} which lead to setting {@code org.apache.cxf.transport.service_not_available}
* for all responses with those status codes. This is used e.g. by the
* {@code org.apache.cxf.clustering.FailoverTargetSelector} to determine if it should do the fail-over.
* Default: {@code 404,429,503} as per {@code DEFAULT_SERVICE_NOT_AVAILABLE_ON_HTTP_STATUS_CODES}
*/
public static final String SERVICE_NOT_AVAILABLE_ON_HTTP_STATUS_CODES =
public static final String SERVICE_NOT_AVAILABLE_ON_HTTP_STATUS_CODES =
"org.apache.cxf.transport.service_not_available_on_http_status_codes";



/**
* The Logger for this class.
*/
protected static final Logger LOG = LogUtils.getL7dLogger(HTTPConduit.class);

protected static final Set<String> KNOWN_HTTP_VERBS_WITH_NO_CONTENT =
new HashSet<>(Arrays.asList(new String[]{"GET", "HEAD", "OPTIONS", "TRACE"}));

protected static final String HTTP_VERSION = SystemPropertyAction.getPropertyOrNull(FORCE_HTTP_VERSION);

private static final Collection<Integer> DEFAULT_SERVICE_NOT_AVAILABLE_ON_HTTP_STATUS_CODES =
private static final Collection<Integer> DEFAULT_SERVICE_NOT_AVAILABLE_ON_HTTP_STATUS_CODES =
Arrays.asList(404, 429, 503);

private static boolean hasLoggedAsyncWarning;
Expand Down Expand Up @@ -1657,7 +1657,7 @@ protected int doProcessResponseCode() throws IOException {
if (exchange != null) {
exchange.put(Message.RESPONSE_CODE, rc);
final Collection<Integer> serviceNotAvailableOnHttpStatusCodes = MessageUtils
.getContextualIntegers(outMessage, SERVICE_NOT_AVAILABLE_ON_HTTP_STATUS_CODES,
.getContextualIntegers(outMessage, SERVICE_NOT_AVAILABLE_ON_HTTP_STATUS_CODES,
DEFAULT_SERVICE_NOT_AVAILABLE_ON_HTTP_STATUS_CODES);
if (serviceNotAvailableOnHttpStatusCodes.contains(rc)) {
exchange.put("org.apache.cxf.transport.service_not_available", true);
Expand Down Expand Up @@ -1697,7 +1697,7 @@ protected void handleResponseInternal() throws IOException {

if ((!doProcessResponse(outMessage, responseCode)
|| HttpURLConnection.HTTP_ACCEPTED == responseCode)
&& MessageUtils.getContextualBoolean(outMessage,
&& MessageUtils.getContextualBoolean(outMessage,
Message.PROCESS_202_RESPONSE_ONEWAY_OR_PARTIAL, true)) {
in = getPartialResponse();
if (in == null
Expand All @@ -1721,7 +1721,7 @@ protected void handleResponseInternal() throws IOException {
exchange.put("IN_CHAIN_COMPLETE", Boolean.TRUE);

exchange.setInMessage(inMessage);
if (MessageUtils.getContextualBoolean(outMessage,
if (MessageUtils.getContextualBoolean(outMessage,
Message.PROPAGATE_202_RESPONSE_ONEWAY_OR_PARTIAL, false)) {
incomingObserver.onMessage(inMessage);
}
Expand Down
Loading

0 comments on commit 20ca33d

Please sign in to comment.