[Sqlshell-svn] /devel/src/main/java/nl/improved/sqlclient

[SVN by r. <sv...@ca...>]

Author: roy
Date: 2007-11-14 22:22:34 +0100 (Wed, 14 Nov 2007)
New Revision: 199

Modified:
   src/main/java/nl/improved/sqlclient/DBConnector.java
Log:
reset pwd when usernmae is provided


Modified: src/main/java/nl/improved/sqlclient/DBConnector.java
===================================================================
--- src/main/java/nl/improved/sqlclient/DBConnector.java	2007-11-07 11:50:18 UTC (rev 198)
+++ src/main/java/nl/improved/sqlclient/DBConnector.java	2007-11-14 21:22:34 UTC (rev 199)
@@ -209,18 +209,28 @@
             throw new SQLException("Failed to connect: Could not initialize driver '"+settings.getDriver()+"'", e);
         }
 
+
         String username;
+        String password;
         if (usr == null || usr.length() == 0) {
             username = settings.getUsername();
+            if (pwd == null) {
+                password = settings.getPassword();
+            } else {
+                password = pwd;
+            }
         } else {
             username = usr;
+            if (username != null && !username.equals(settings.getUsername())) {
+                password = pwd;
+            } else {
+                if (pwd == null) {
+                    password = settings.getPassword();
+                } else {
+                    password = pwd;
+                }
+            }
         }
-        String password;
-        if (pwd == null) {
-            password = settings.getPassword();
-        } else {
-            password = pwd;
-        }
 
         if (username == null || password == null) {
             LoginDialog ld = new LoginDialog(username, password);