Thread: [Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session SQLExecuterTask.j
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
From: Rob M. <man...@us...> - 2007-04-21 13:17:39
|
Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv14698/app/src/net/sourceforge/squirrel_sql/client/session Modified Files: SQLExecuterTask.java Log Message: 1704798 (ISQLExecutionListeners cannot return "null"). Properly handle the case where an ISQLExecutionListener returns null for statementExecuting() to indicate that the statement should not be executed. In this case, skip the execution, but log it at INFO so that we can effectively troubleshoot any plugins that do this unexpectedly. Index: SQLExecuterTask.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/SQLExecuterTask.java,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** SQLExecuterTask.java 14 Feb 2007 23:21:31 -0000 1.33 --- SQLExecuterTask.java 21 Apr 2007 13:17:03 -0000 1.34 *************** *** 92,95 **** --- 92,101 ---- public SQLExecuterTask(ISession session, String sql, ISQLExecuterHandler handler, ISQLExecutionListener[] executionListeners) { + if (sql == null) { + if (s_log.isDebugEnabled()) { + s_log.debug("init(): expected non-null sql"); + return; + } + } _session = session; _schemaInfoUpdateCheck = new SchemaInfoUpdateCheck(_session); *************** *** 120,123 **** --- 126,136 ---- public void run() { + if (_sql == null) { + if (s_log.isDebugEnabled()) { + s_log.debug("init(): expected non-null sql. Skipping execution"); + } + return; + } + String lastExecutedStatement = null; int statementCount = 0; |