From 37d47afe699b82e7dca2c952d9d18fb9aec2b95a Mon Sep 17 00:00:00 2001
From: "shaojin.wensj" <shaojin.wensj@alibaba-inc.com>
Date: Sun, 19 Feb 2023 19:27:16 +0800
Subject: [PATCH] fix connectTimeout & socketTimeout in postgresql, for issue
 #5096

---
 .../alibaba/druid/pool/DruidAbstractDataSource.java   | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/core/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
index b42b172342..77ad1016ac 100644
--- a/core/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
+++ b/core/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
@@ -1763,15 +1763,8 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
 
                 physicalConnectProperties.put("oracle.net.CONNECT_TIMEOUT", connectTimeoutStr);
             } else if (driver != null && "org.postgresql.Driver".equals(driver.getClass().getName())) {
-                if (connectTimeoutStr == null) {
-                    connectTimeoutStr = Integer.toString(connectTimeout);
-                }
-                physicalConnectProperties.put("loginTimeout", connectTimeoutStr);
-
-                if (socketTimeoutSr == null) {
-                    socketTimeoutSr = Integer.toString(socketTimeout);
-                }
-                physicalConnectProperties.put("socketTimeout", socketTimeoutSr);
+                physicalConnectProperties.put("loginTimeout", connectTimeout);
+                physicalConnectProperties.put("socketTimeout", socketTimeout);
             }
         }