You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by gg...@apache.org on 2018/09/30 18:24:14 UTC
httpcomponents-core git commit: Rename
org.apache.hc.core5.http.EndpointDetails.getSocketTimeout() to
getSocketTimeoutMillis().
Repository: httpcomponents-core
Updated Branches:
refs/heads/master 31be6d63a -> de9e4d6d9
Rename org.apache.hc.core5.http.EndpointDetails.getSocketTimeout() to
getSocketTimeoutMillis().
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/commit/de9e4d6d
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/de9e4d6d
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/de9e4d6d
Branch: refs/heads/master
Commit: de9e4d6d93dda73a06cd3f4cac7057d8a87aad74
Parents: 31be6d6
Author: Gary Gregory <gg...@rocketsoftware.com>
Authored: Sun Sep 30 12:24:09 2018 -0600
Committer: Gary Gregory <gg...@rocketsoftware.com>
Committed: Sun Sep 30 12:24:09 2018 -0600
----------------------------------------------------------------------
RELEASE_NOTES.txt | 4 +++-
.../java/org/apache/hc/core5/http/EndpointDetails.java | 10 +++++-----
.../apache/hc/core5/http/impl/BasicEndpointDetails.java | 4 ++--
.../apache/hc/core5/http/impl/io/BHttpConnectionBase.java | 8 ++++----
4 files changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/de9e4d6d/RELEASE_NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index fff6540..cf0c3f4 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -13,6 +13,9 @@ Changelog
* Update the org.apache.hc.core5.http.protocol.HttpContext.setAttribute(String, Object) API to return the previous value.
Contributed by Gary Gregory <ggregory at apache.org>
+* Rename org.apache.hc.core5.http.EndpointDetails.getSocketTimeout() to getSocketTimeoutMillis().
+ Contributed by Gary Gregory <ggregory at apache.org>
+
Release 5.0-BETA3
-------------------
@@ -116,7 +119,6 @@ Changelog
Contributed by Oleg Kalnichevski <olegk at apache.org>
-
Release 5.0-BETA2
-------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/de9e4d6d/httpcore5/src/main/java/org/apache/hc/core5/http/EndpointDetails.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/EndpointDetails.java b/httpcore5/src/main/java/org/apache/hc/core5/http/EndpointDetails.java
index edbaaa9..6c5ad74 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/EndpointDetails.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/EndpointDetails.java
@@ -40,13 +40,13 @@ public abstract class EndpointDetails implements HttpConnectionMetrics {
private final SocketAddress remoteAddress;
private final SocketAddress localAddress;
- private final int socketTimeout;
+ private final int socketTimeoutMillis;
protected EndpointDetails(final SocketAddress remoteAddress, final SocketAddress localAddress,
- final int socketTimeout) {
+ final int socketTimeoutMillis) {
this.remoteAddress = remoteAddress;
this.localAddress = localAddress;
- this.socketTimeout = socketTimeout;
+ this.socketTimeoutMillis = socketTimeoutMillis;
}
public SocketAddress getRemoteAddress() {
@@ -90,8 +90,8 @@ public abstract class EndpointDetails implements HttpConnectionMetrics {
*
* @return the socket timeout.
*/
- public int getSocketTimeout() {
- return socketTimeout;
+ public int getSocketTimeoutMillis() {
+ return socketTimeoutMillis;
}
@Override
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/de9e4d6d/httpcore5/src/main/java/org/apache/hc/core5/http/impl/BasicEndpointDetails.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/BasicEndpointDetails.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/BasicEndpointDetails.java
index f312bff..be489f1 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/BasicEndpointDetails.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/BasicEndpointDetails.java
@@ -45,8 +45,8 @@ public final class BasicEndpointDetails extends EndpointDetails {
final SocketAddress remoteAddress,
final SocketAddress localAddress,
final HttpConnectionMetrics metrics,
- final int socketTimeout) {
- super(remoteAddress, localAddress, socketTimeout);
+ final int socketTimeoutMillis) {
+ super(remoteAddress, localAddress, socketTimeoutMillis);
this.metrics = metrics;
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/de9e4d6d/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/BHttpConnectionBase.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/BHttpConnectionBase.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/BHttpConnectionBase.java
index 9ef054a..8012817 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/BHttpConnectionBase.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/BHttpConnectionBase.java
@@ -334,14 +334,14 @@ class BHttpConnectionBase implements BHttpConnection {
if (socketHolder != null) {
@SuppressWarnings("resource")
final Socket socket = socketHolder.getSocket();
- int soTimeout;
+ int soTimeoutMillis;
try {
- soTimeout = socket.getSoTimeout();
+ soTimeoutMillis = socket.getSoTimeout();
} catch (final SocketException e) {
- soTimeout = 0;
+ soTimeoutMillis = 0;
}
endpointDetails = new BasicEndpointDetails(socket.getRemoteSocketAddress(),
- socket.getLocalSocketAddress(), this.connMetrics, soTimeout);
+ socket.getLocalSocketAddress(), this.connMetrics, soTimeoutMillis);
}
}
return endpointDetails;