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

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

Author: roy
Date: 2009-03-01 17:55:05 +0100 (Sun, 01 Mar 2009)
New Revision: 389

Modified:
   src/main/java/nl/improved/sqlclient/AbstractSQLShellWindow.java
Log:
fixed npe when cancelling login


Modified: src/main/java/nl/improved/sqlclient/AbstractSQLShellWindow.java
===================================================================
--- src/main/java/nl/improved/sqlclient/AbstractSQLShellWindow.java	2009-03-01 16:46:31 UTC (rev 388)
+++ src/main/java/nl/improved/sqlclient/AbstractSQLShellWindow.java	2009-03-01 16:55:05 UTC (rev 389)
@@ -1315,6 +1315,9 @@
                     password = predefinedSettings.getPassword();
                 }
                 String[] credentials = getLoginCredentials(username, password);
+                if (credentials == null) {
+                    return null;
+                }
                 username = credentials[0];
                 password = credentials[1];
             }