From b8cf3b02dc1a10a3a7631801fa20ea904103b668 Mon Sep 17 00:00:00 2001 From: Kevin Wooten Date: Tue, 27 Oct 2020 22:12:10 -0700 Subject: [PATCH] Revert work-around for issue #392 --- .../protocol/v30/ServerConnectionFactory.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/driver/src/main/java/com/impossibl/postgres/protocol/v30/ServerConnectionFactory.java b/driver/src/main/java/com/impossibl/postgres/protocol/v30/ServerConnectionFactory.java index 6508d2251..01a41eb83 100644 --- a/driver/src/main/java/com/impossibl/postgres/protocol/v30/ServerConnectionFactory.java +++ b/driver/src/main/java/com/impossibl/postgres/protocol/v30/ServerConnectionFactory.java @@ -140,10 +140,10 @@ public ServerConnection connect(Configuration config, SocketAddress address, Ser SSLMode sslMode = config.getSetting(SSL_MODE); - return connect(config, sslMode, address, listener, 1); + return connect(config, sslMode, address, listener); } - private ServerConnection connect(Configuration config, SSLMode sslMode, SocketAddress address, ServerConnection.Listener listener, int attempt) throws IOException { + private ServerConnection connect(Configuration config, SSLMode sslMode, SocketAddress address, ServerConnection.Listener listener) throws IOException { try { @@ -180,7 +180,7 @@ private ServerConnection connect(Configuration config, SSLMode sslMode, SocketAd // Retry with no SSL if (sslMode == SSLMode.Prefer) { - return connect(config, SSLMode.Disable, address, listener, attempt); + return connect(config, SSLMode.Disable, address, listener); } throw e; @@ -230,16 +230,12 @@ else if (sslMode.isRequired()) { switch (sslMode) { case Allow: - return connect(config, SSLMode.Require, address, listener, attempt); + return connect(config, SSLMode.Require, address, listener); case Prefer: - return connect(config, SSLMode.Disable, address, listener, attempt); + return connect(config, SSLMode.Disable, address, listener); default: - // WORKAROUND: ISSUE#392: Retrying random startup disconnect mitigates failures. - if (e instanceof ClosedChannelException && attempt < 2) { - return connect(config, sslMode, address, listener, attempt + 1); - } throw e; }