Skip to content

Commit

Permalink
Bump guava to version 23
Browse files Browse the repository at this point in the history
  • Loading branch information
shs96c committed Aug 17, 2017
1 parent ac8a466 commit 1792fac
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>20.0</version>
<version>23.0</version>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ private void initializeConnectionFlow() {
.serverSslEngine()));
} else {
connectionFlow.then(serverConnection.EncryptChannel(proxyServer.getMitmManager()
.serverSslEngine(parsedHostAndPort.getHostText(), parsedHostAndPort.getPort())));
.serverSslEngine(parsedHostAndPort.getHost(), parsedHostAndPort.getPort())));
}

connectionFlow
Expand Down Expand Up @@ -958,7 +958,7 @@ public static InetSocketAddress addressFor(String hostAndPort, DefaultHttpProxyS
throw new UnknownHostException(hostAndPort);
}

String host = parsedHostAndPort.getHostText();
String host = parsedHostAndPort.getHost();
int port = parsedHostAndPort.getPortOrDefault(80);

return proxyServer.getServerResolver().resolve(host, port);
Expand Down

0 comments on commit 1792fac

Please sign in to comment.