#6618 Commit/rollback commands are enabled always (in manual txn mode)

ab941705 · Serge Rider · cde25aa0 · ab941705
隐藏空白更改
内联并排

Showing with 4 addition and 2 deletion

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/DataSourcePropertyTester.java ...rg/jkiss/dbeaver/ui/actions/DataSourcePropertyTester.java +4 -2

未找到文件。
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/DataSourcePropertyTester.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/DataSourcePropertyTester.java
@@ -94,8 +94,10 @@ public class DataSourcePropertyTester extends PropertyTester
                }
                case PROP_TRANSACTION_ACTIVE:
                    if (context != null && context.isConnected()) {
-                        boolean active = QMUtils.isTransactionActive(context);
+                        DBCTransactionManager txnManager = DBUtils.getTransactionManager(context);
-                        return Boolean.valueOf(active).equals(expectedValue);
+                        return txnManager != null && !txnManager.isAutoCommit();
+//                        boolean active = QMUtils.isTransactionActive(context);
+//                        return Boolean.valueOf(active).equals(expectedValue);
                    }
                    return Boolean.FALSE.equals(expectedValue);
            }