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);
             }
         }