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

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

Author: roy
Date: 2008-08-24 20:49:27 +0200 (Sun, 24 Aug 2008)
New Revision: 297

Modified:
   src/main/java/nl/improved/sqlclient/AbstractSQLShellWindow.java
Log:
don't return 'succesfully' when failed to read file to be executed '@'


Modified: src/main/java/nl/improved/sqlclient/AbstractSQLShellWindow.java
===================================================================
--- src/main/java/nl/improved/sqlclient/AbstractSQLShellWindow.java	2008-08-23 12:32:57 UTC (rev 296)
+++ src/main/java/nl/improved/sqlclient/AbstractSQLShellWindow.java	2008-08-24 18:49:27 UTC (rev 297)
@@ -1961,14 +1961,15 @@
                         }.start();
                     }
                 }
+                if (cancelled) {
+                    return "Execution of file '" + toFileName(command.substring(1)) +"' aborted....";
+                }
+                return "File '" + toFileName(command.substring(1)) +"' executed successfully.";
             } catch(IOException e) {
                 error(e);
+                return "File '" + toFileName(command.substring(1)) +"' ended with errors.";
             } finally {
                 if (fin != null) try { fin.close();}catch(Exception e) {/*ignore*/}
-                if (cancelled) {
-                    return "Execution of file '" + toFileName(command.substring(1)) +"' aborted....";
-                }
-                return "File '" + toFileName(command.substring(1)) +"' executed successfully.";
             }
         }