aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/interfaces/jdbc/org/postgresql/Connection.java9
-rw-r--r--src/interfaces/jdbc/org/postgresql/Driver.java.in2
2 files changed, 3 insertions, 8 deletions
diff --git a/src/interfaces/jdbc/org/postgresql/Connection.java b/src/interfaces/jdbc/org/postgresql/Connection.java
index d00e580c4b3..0982428e9ec 100644
--- a/src/interfaces/jdbc/org/postgresql/Connection.java
+++ b/src/interfaces/jdbc/org/postgresql/Connection.java
@@ -11,7 +11,7 @@ import org.postgresql.util.*;
import org.postgresql.core.*;
/**
- * $Id: Connection.java,v 1.33 2001/10/31 20:26:01 davec Exp $
+ * $Id: Connection.java,v 1.34 2001/11/01 01:08:36 barry Exp $
*
* This abstract class is used by org.postgresql.Driver to open either the JDBC1 or
* JDBC2 versions of the Connection class.
@@ -110,16 +110,11 @@ public abstract class Connection
if (info.getProperty("user") == null)
throw new PSQLException("postgresql.con.user");
-
- PG_PASSWORD = info.getProperty("password");
- // allow a null password D.C.
- if ( PG_PASSWORD== null)
- PG_PASSWORD = "";
-
this_driver = d;
this_url = url;
PG_DATABASE = database;
PG_USER = info.getProperty("user");
+ PG_PASSWORD = info.getProperty("password","");
PG_PORT = port;
PG_HOST = host;
PG_STATUS = CONNECTION_BAD;
diff --git a/src/interfaces/jdbc/org/postgresql/Driver.java.in b/src/interfaces/jdbc/org/postgresql/Driver.java.in
index aa9fe52b9a4..5201c8c72df 100644
--- a/src/interfaces/jdbc/org/postgresql/Driver.java.in
+++ b/src/interfaces/jdbc/org/postgresql/Driver.java.in
@@ -33,7 +33,7 @@ public class Driver implements java.sql.Driver
protected static final int ERROR = 3;
protected static final int FATAL = 4;
- private static int logLevel= DEBUG;
+ private static int logLevel= FATAL;
static
{