This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.1 by this push:
new f278c3cb6 Fix CloseableHttpResponse not being closed. close #3805
(#3815)
f278c3cb6 is described below
commit f278c3cb6e1cdb1cfc549d5f59e67b8f5c6fe26e
Author: peacewong <[email protected]>
AuthorDate: Mon Nov 14 17:34:38 2022 +0800
Fix CloseableHttpResponse not being closed. close #3805 (#3815)
---
.../linkis/httpclient/AbstractHttpClient.scala | 132 +++++++++++----------
1 file changed, 70 insertions(+), 62 deletions(-)
diff --git
a/linkis-commons/linkis-httpclient/src/main/scala/org/apache/linkis/httpclient/AbstractHttpClient.scala
b/linkis-commons/linkis-httpclient/src/main/scala/org/apache/linkis/httpclient/AbstractHttpClient.scala
index 2b63ba5e6..dbebaac03 100644
---
a/linkis-commons/linkis-httpclient/src/main/scala/org/apache/linkis/httpclient/AbstractHttpClient.scala
+++
b/linkis-commons/linkis-httpclient/src/main/scala/org/apache/linkis/httpclient/AbstractHttpClient.scala
@@ -149,6 +149,7 @@ abstract class AbstractHttpClient(clientConfig:
ClientConfig, clientName: String
logger.warn("failed to parse entity", t)
""
}
+ IOUtils.closeQuietly(response)
throw new HttpClientRetryException(
"The user is not logged in, please log in first, you can set a
retry, message: " + msg
)
@@ -474,78 +475,85 @@ abstract class AbstractHttpClient(clientConfig:
ClientConfig, clientName: String
response
}
- protected def responseToResult(response: HttpResponse, requestAction:
Action): Result = {
- val entity = response.getEntity
- val result = requestAction match {
- case download: DownloadAction =>
- val statusCode = response.getStatusLine.getStatusCode
- if (statusCode != 200) {
+ protected def responseToResult(response: HttpResponse, requestAction:
Action): Result =
+ Utils.tryFinally {
+ val entity = response.getEntity
+ val result = requestAction match {
+ case download: DownloadAction =>
+ val statusCode = response.getStatusLine.getStatusCode
+ if (statusCode != 200) {
+ var responseBody: String = null
+ if (entity != null) {
+ responseBody = EntityUtils.toString(entity, "UTF-8")
+ }
+ response match {
+ case r: CloseableHttpResponse =>
+ IOUtils.closeQuietly(r)
+ case _ =>
+ }
+ throw new HttpClientResultException(s"request failed! ResponseBody
is $responseBody.")
+ }
+ val inputStream =
+ if (
+ entity.getContentEncoding != null && StringUtils.isNotBlank(
+ entity.getContentEncoding.getValue
+ )
+ ) {
+
entity.getContentEncoding.getValue.toLowerCase(Locale.getDefault) match {
+ case "gzip" => new GzipDecompressingEntity(entity).getContent
+ case "deflate" => new
DeflateDecompressingEntity(entity).getContent
+ case str =>
+ throw new HttpClientResultException(
+ s"request failed! Reason: not support decompress type
$str."
+ )
+ }
+ } else entity.getContent
+ download.write(inputStream, response)
+ Result()
+ case heartbeat: HeartbeatAction =>
+ discovery
+ .map { case d: AbstractDiscovery =>
+ d.getHeartbeatResult(response, heartbeat)
+ }
+ .getOrElse(
+ throw new HttpMessageParseException(
+ "Discovery is not enable, HeartbeatAction is not needed!"
+ )
+ )
+ case auth: AuthenticationAction =>
+ clientConfig.getAuthenticationStrategy match {
+ case a: AbstractAuthenticationStrategy =>
a.getAuthenticationResult(response, auth)
+ case _ =>
+ throw new HttpMessageParseException(
+ "AuthenticationStrategy is not enable, login is not needed!"
+ )
+ }
+ case httpAction: HttpAction =>
var responseBody: String = null
if (entity != null) {
responseBody = EntityUtils.toString(entity, "UTF-8")
}
- throw new HttpClientResultException(s"request failed! ResponseBody
is $responseBody.")
- }
- val inputStream =
- if (
- entity.getContentEncoding != null && StringUtils.isNotBlank(
- entity.getContentEncoding.getValue
- )
- ) {
- entity.getContentEncoding.getValue.toLowerCase(Locale.getDefault)
match {
- case "gzip" => new GzipDecompressingEntity(entity).getContent
- case "deflate" => new
DeflateDecompressingEntity(entity).getContent
- case str =>
- throw new HttpClientResultException(
- s"request failed! Reason: not support decompress type $str."
- )
- }
- } else entity.getContent
- download.write(inputStream, response)
- Result()
- case heartbeat: HeartbeatAction =>
- discovery
- .map { case d: AbstractDiscovery =>
- d.getHeartbeatResult(response, heartbeat)
+ httpResponseToResult(response, httpAction, responseBody)
+ .getOrElse(throw new HttpMessageParseException("cannot parse
message: " + responseBody))
+ }
+ result match {
+ case userAction: UserAction =>
+ requestAction match {
+ case _userAction: UserAction =>
userAction.setUser(_userAction.getUser)
+ case _ =>
}
- .getOrElse(
- throw new HttpMessageParseException(
- "Discovery is not enable, HeartbeatAction is not needed!"
- )
- )
- case auth: AuthenticationAction =>
- clientConfig.getAuthenticationStrategy match {
- case a: AbstractAuthenticationStrategy =>
a.getAuthenticationResult(response, auth)
- case _ =>
- throw new HttpMessageParseException(
- "AuthenticationStrategy is not enable, login is not needed!"
- )
- }
- case httpAction: HttpAction =>
- var responseBody: String = null
- if (entity != null) {
- responseBody = EntityUtils.toString(entity, "UTF-8")
- }
- httpResponseToResult(response, httpAction, responseBody)
- .getOrElse(throw new HttpMessageParseException("cannot parse
message: " + responseBody))
- }
- if (!requestAction.isInstanceOf[DownloadAction]) {
- response match {
- case r: CloseableHttpResponse =>
- r.close()
case _ =>
}
- }
- result match {
- case userAction: UserAction =>
- requestAction match {
- case _userAction: UserAction =>
userAction.setUser(_userAction.getUser)
+ result
+ } {
+ if (!requestAction.isInstanceOf[DownloadAction]) {
+ response match {
+ case r: CloseableHttpResponse =>
+ IOUtils.closeQuietly(r)
case _ =>
}
- case _ =>
+ }
}
- result
- }
protected def httpResponseToResult(
response: HttpResponse,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
