Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7373be5

Browse files
author
Stephane Landelle
committed
Drop Proxy.getURI,closeAsyncHttpClient#586
1 parent8bbd4d3 commit7373be5

File tree

3 files changed

+9
-15
lines changed

3 files changed

+9
-15
lines changed

‎src/main/java/com/ning/http/client/ProxyServer.java‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,10 @@
1616
*/
1717
packagecom.ning.http.client;
1818

19-
importjava.net.URI;
2019
importjava.util.ArrayList;
2120
importjava.util.Collections;
2221
importjava.util.List;
2322

24-
importcom.ning.http.util.AsyncHttpProviderUtils;
25-
2623
/**
2724
* Represents a proxy server.
2825
*/
@@ -53,7 +50,7 @@ public String toString() {
5350
privatefinalStringprincipal;
5451
privatefinalStringpassword;
5552
privatefinalintport;
56-
privatefinalURIuri;
53+
privatefinalStringurl;
5754
privateStringencoding ="UTF-8";
5855
privateStringntlmDomain =System.getProperty("http.auth.ntlm.domain","");
5956

@@ -63,7 +60,7 @@ public ProxyServer(final Protocol protocol, final String host, final int port, S
6360
this.port =port;
6461
this.principal =principal;
6562
this.password =password;
66-
uri =AsyncHttpProviderUtils.createNonEmptyPathURI(toString());
63+
this.url =protocol +"://" +host +":" +port;
6764
}
6865

6966
publicProxyServer(finalStringhost,finalintport,Stringprincipal,Stringpassword) {
@@ -102,10 +99,6 @@ public String getPassword() {
10299
returnpassword;
103100
}
104101

105-
publicURIgetURI() {
106-
returnuri;
107-
}
108-
109102
publicProxyServersetEncoding(Stringencoding) {
110103
this.encoding =encoding;
111104
returnthis;
@@ -138,9 +131,13 @@ public String getNtlmDomain() {
138131
returnntlmDomain;
139132
}
140133

134+
publicStringgetUrl() {
135+
returnurl;
136+
}
137+
141138
@Override
142139
publicStringtoString() {
143-
returnprotocol +"://" +host +":" +port;
140+
returnurl;
144141
}
145142
}
146143

‎src/main/java/com/ning/http/client/providers/grizzly/GrizzlyAsyncHttpProvider.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2590,10 +2590,7 @@ public void updated(Connection result) {
25902590
privatestaticStringgetPoolKey(Requestrequest,ProxyServerproxyServer) {
25912591
StringserverPart =
25922592
request.getConnectionPoolKeyStrategy().getKey(request.getURI());
2593-
returnproxyServer !=null
2594-
?AsyncHttpProviderUtils.getBaseUrl(proxyServer.getURI())
2595-
+serverPart
2596-
:serverPart;
2593+
returnproxyServer !=null ?proxyServer.getUrl() +serverPart :serverPart;
25972594
}
25982595

25992596
// ------------------------------------------------------ Nested Classes

‎src/main/java/com/ning/http/client/providers/netty/NettyAsyncHttpProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1329,7 +1329,7 @@ private String getPoolKey(NettyResponseFuture<?> future) {
13291329

13301330
privateStringgetPoolKey(URIuri,ProxyServerproxy,ConnectionPoolKeyStrategystrategy) {
13311331
StringserverPart =strategy.getKey(uri);
1332-
returnproxy !=null ?AsyncHttpProviderUtils.getBaseUrl(proxy.getURI()) +serverPart :serverPart;
1332+
returnproxy !=null ?proxy.getUrl() +serverPart :serverPart;
13331333
}
13341334

13351335
privatevoiddrainChannel(finalChannelHandlerContextctx,finalNettyResponseFuture<?>future) {

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp