Code cleanup

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetDataPumpJob.java

@@ -299,11 +299,14 @@ class ResultSetDataPumpJob extends DataSourceJob implements DBCExecutionSource {
 
             @Override
             protected IStatus runInUIThread(DBRProgressMonitor monitor) {
+                // TODO: to something
+/*
                 if (!finished) {
                     error = new DBException("Query cancellation timeout. Query processing was terminated in UI.");
                     finished = true;
                     finishProgress();
                 }
+*/
                 return Status.OK_STATUS;
             }
         }

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/struct/JDBCTable.java

@@ -145,7 +145,7 @@ public abstract class JDBCTable<DATASOURCE extends DBPDataSource, CONTAINER exte
 
         StringBuilder query = new StringBuilder(100);
         query.append("SELECT ");
-        appendSelectSource(session.getProgressMonitor(), query, tableAlias, rowIdAttribute);
+        appendSelectSource(monitor, query, tableAlias, rowIdAttribute);
         query.append(" FROM ").append(getFullQualifiedName());
         if (tableAlias != null) {
             query.append(" ").append(tableAlias); //$NON-NLS-1$
@@ -166,6 +166,9 @@ public abstract class JDBCTable<DATASOURCE extends DBPDataSource, CONTAINER exte
             firstRow,
             maxRows))
         {
+            if (monitor.isCanceled()) {
+                return statistics;
+            }
             if (dbStat instanceof JDBCStatement && maxRows > 0) {
                 boolean useFetchSize = getDataSource().getContainer().getPreferenceStore().getBoolean(ModelPreferences.RESULT_SET_USE_FETCH_SIZE);
                 if (useFetchSize) {
@@ -183,7 +186,7 @@ public abstract class JDBCTable<DATASOURCE extends DBPDataSource, CONTAINER exte
             statistics.setExecuteTime(System.currentTimeMillis() - startTime);
             if (executeResult) {
                 DBCResultSet dbResult = dbStat.openResultSet();
-                if (dbResult != null) {
+                if (dbResult != null && !monitor.isCanceled()) {
                     try {
                         if (rowIdAttribute != null) {
                             String attrId = rowIdAttribute.getAlias();

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/runtime/AbstractJob.java

@@ -43,7 +43,7 @@ public abstract class AbstractJob extends Job
 
     // Attached job may be used to "overwrite" current job.
     // It happens if some other AbstractJob runs in sync mode
-    protected final static ThreadLocal<AbstractJob> CURRENT_JOB = new ThreadLocal<AbstractJob>();
+    protected final static ThreadLocal<AbstractJob> CURRENT_JOB = new ThreadLocal<>();
 
     protected AbstractJob(String name)
     {