Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
duniter4j
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
clients
java
duniter4j
Commits
3e554eaa
Commit
3e554eaa
authored
6 years ago
by
Benoit Lavenier
Browse files
Options
Downloads
Patches
Plain Diff
[fix] Do not retry http request if HttpHostConnectException
parent
5c4cb1d1
Branches
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#4327
passed
6 years ago
Stage: github-sync
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
duniter4j-core-client/src/main/java/org/duniter/core/client/service/HttpServiceImpl.java
+8
-1
8 additions, 1 deletion
...java/org/duniter/core/client/service/HttpServiceImpl.java
with
8 additions
and
1 deletion
duniter4j-core-client/src/main/java/org/duniter/core/client/service/HttpServiceImpl.java
+
8
−
1
View file @
3e554eaa
...
@@ -41,6 +41,7 @@ import org.apache.http.client.protocol.HttpClientContext;
...
@@ -41,6 +41,7 @@ import org.apache.http.client.protocol.HttpClientContext;
import
org.apache.http.client.utils.URIBuilder
;
import
org.apache.http.client.utils.URIBuilder
;
import
org.apache.http.config.SocketConfig
;
import
org.apache.http.config.SocketConfig
;
import
org.apache.http.conn.ConnectTimeoutException
;
import
org.apache.http.conn.ConnectTimeoutException
;
import
org.apache.http.conn.HttpHostConnectException
;
import
org.apache.http.entity.ContentType
;
import
org.apache.http.entity.ContentType
;
import
org.apache.http.impl.client.CloseableHttpClient
;
import
org.apache.http.impl.client.CloseableHttpClient
;
import
org.apache.http.impl.client.HttpClients
;
import
org.apache.http.impl.client.HttpClients
;
...
@@ -294,11 +295,17 @@ public class HttpServiceImpl implements HttpService, Closeable, InitializingBean
...
@@ -294,11 +295,17 @@ public class HttpServiceImpl implements HttpService, Closeable, InitializingBean
// SSL handshake exception
// SSL handshake exception
retrying
=
false
;
retrying
=
false
;
}
}
else
if
(
exception
instanceof
HttpHostConnectException
)
{
// Host connect error
retrying
=
false
;
}
if
(
retrying
&&
executionCount
>=
maxRetryCount
)
{
if
(
retrying
&&
executionCount
>=
maxRetryCount
)
{
// Do not retry if over max retry count
// Do not retry if over max retry count
return
false
;
return
false
;
}
}
HttpClientContext
clientContext
=
HttpClientContext
.
adapt
(
context
);
HttpClientContext
clientContext
=
HttpClientContext
.
adapt
(
context
);
HttpRequest
request
=
clientContext
.
getRequest
();
HttpRequest
request
=
clientContext
.
getRequest
();
if
(!
retrying
)
{
if
(!
retrying
)
{
...
@@ -331,7 +338,7 @@ public class HttpServiceImpl implements HttpService, Closeable, InitializingBean
...
@@ -331,7 +338,7 @@ public class HttpServiceImpl implements HttpService, Closeable, InitializingBean
@SuppressWarnings
(
"unchecked"
)
@SuppressWarnings
(
"unchecked"
)
protected
<
T
>
T
executeRequest
(
HttpClient
httpClient
,
HttpUriRequest
request
,
Class
<?
extends
T
>
resultClass
,
Class
<?>
errorClass
)
{
protected
<
T
>
T
executeRequest
(
HttpClient
httpClient
,
HttpUriRequest
request
,
Class
<?
extends
T
>
resultClass
,
Class
<?>
errorClass
)
{
return
executeRequest
(
httpClient
,
request
,
resultClass
,
errorClass
,
5
);
return
executeRequest
(
httpClient
,
request
,
resultClass
,
errorClass
,
1
);
}
}
protected
<
T
>
T
executeRequest
(
HttpClient
httpClient
,
HttpUriRequest
request
,
Class
<?
extends
T
>
resultClass
,
Class
<?>
errorClass
,
int
retryCount
)
{
protected
<
T
>
T
executeRequest
(
HttpClient
httpClient
,
HttpUriRequest
request
,
Class
<?
extends
T
>
resultClass
,
Class
<?>
errorClass
,
int
retryCount
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment