[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6470] trunk/sql12

[<wi...@us...>]

Revision: 6470
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6470&view=rev
Author:   wis775
Date:     2011-11-05 12:05:40 +0000 (Sat, 05 Nov 2011)
Log Message:
-----------
Bug 3433001: Incorrect elapsed output time

Modified Paths:
--------------
    trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java
    trunk/sql12/doc/src/main/resources/changes.txt

Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java	2011-11-05 09:39:56 UTC (rev 6469)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java	2011-11-05 12:05:40 UTC (rev 6470)
@@ -667,31 +667,33 @@
         return (IResultTab)_tabbedExecutionsPanel.getSelectedComponent();
     }
 
-   private void onAddResultsTab(final SQLExecutionInfo exInfo,
-                                final ResultSetDataSet rsds,
-                                final ResultSetMetaDataDataSet mdds,
-                                final IDataSetUpdateableTableModel creator,
-                                final IResultTab resultTabToReplace)
-	{
-      SwingUtilities.invokeLater(new Runnable()
-      {
-         public void run()
-         {
-            try
-            {
-               ResultTab tab = _resultTabFactory.createResultTab(exInfo, creator, rsds, mdds);
+    private void onAddResultsTab(final SQLExecutionInfo exInfo,
+    		final ResultSetDataSet rsds,
+    		final ResultSetMetaDataDataSet mdds,
+    		final IDataSetUpdateableTableModel creator,
+    		final IResultTab resultTabToReplace)
+    {
+    	try
+    	{
 
-               addResultsTab(tab, resultTabToReplace);
-               _tabbedExecutionsPanel.setSelectedComponent(tab);
-            }
-            catch (Throwable t)
-            {
-               _session.showErrorMessage(t);
-            }
-         }
-      });
-	}
+    		// Creating the resultTab must not be asynchronous. Otherwise, the Execution Info would be wrong
+    		final ResultTab tab = _resultTabFactory.createResultTab(exInfo, creator, rsds, mdds);
 
+    		SwingUtilities.invokeLater(new Runnable()
+    		{
+    			public void run()
+    			{
+    				addResultsTab(tab, resultTabToReplace);
+    				_tabbedExecutionsPanel.setSelectedComponent(tab);
+    			}
+    		});
+    	}catch (Throwable t)
+    	{
+    		_session.showErrorMessage(t);
+    	}
+
+    }
+
    private void onRemoveCancelPanel(final CancelPanelCtrl cancelPanelCtrl, final IResultTab resultTabToReplace)
    {
       SwingUtilities.invokeLater(new Runnable()

Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt	2011-11-05 09:39:56 UTC (rev 6469)
+++ trunk/sql12/doc/src/main/resources/changes.txt	2011-11-05 12:05:40 UTC (rev 6470)
@@ -129,6 +129,8 @@
 
 Bug-fixes:
 
+3433001: Elapsed time for building output is incorrect.
+
 3183001: ClassCastException occurs, when the first tab should be closed after running a query.
 
 Hibernate Plugin:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.