proper implementation of LocalSession.hasPendingTransaction(), replac…

…e LocalSession.containsUncommitted()

h2/src/main/org/h2/engine/SessionLocal.java

@@ -541,7 +541,7 @@ public int getLockTimeout() {
 
     public void setLockTimeout(int lockTimeout) {
         this.lockTimeout = lockTimeout;
-        if (transaction != null) {
+        if (hasTransaction()) {
             transaction.setTimeoutMillis(lockTimeout);
         }
     }
@@ -649,7 +649,7 @@ public Database getDatabase() {
      */
     public void commit(boolean ddl) {
         beforeCommitOrRollback();
-        if (transaction != null) {
+        if (hasTransaction()) {
             try {
                 markUsedTablesAsUpdated();
                 transaction.commit();
@@ -749,7 +749,7 @@ private void endTransaction() {
             database.releaseDatabaseObjectIds(idsToRelease);
             idsToRelease = null;
         }
-        if (transaction != null && !transaction.allowNonRepeatableRead()) {
+        if (hasTransaction() && !transaction.allowNonRepeatableRead()) {
             snapshotDataModificationId = database.getNextModificationDataId();
         }
     }
@@ -769,7 +769,7 @@ public long getSnapshotDataModificationId() {
      */
     public void rollback() {
         beforeCommitOrRollback();
-        if (transaction != null) {
+        if (hasTransaction()) {
             rollbackTo(null);
         }
         idsToRelease = null;
@@ -788,7 +788,7 @@ public void rollback() {
      */
     public void rollbackTo(Savepoint savepoint) {
         int index = savepoint == null ? 0 : savepoint.logIndex;
-        if (transaction != null) {
+        if (hasTransaction()) {
             markUsedTablesAsUpdated();
             if (savepoint == null) {
                 transaction.rollback();
@@ -818,7 +818,7 @@ public void rollbackTo(Savepoint savepoint) {
 
     @Override
     public boolean hasPendingTransaction() {
-        return false;
+        return hasTransaction() && transaction.hasChanges() && transaction.getStatus() != Transaction.STATUS_PREPARED;
     }
 
     /**
@@ -923,6 +923,11 @@ void unlock(Table t) {
         locks.remove(t);
     }
 
+
+    private boolean hasTransaction() {
+        return transaction != null;
+    }
+
     private void unlockAll() {
         if (!locks.isEmpty()) {
             Table[] array = locks.toArray(new Table[0]);
@@ -1094,7 +1099,7 @@ public void rollbackToSavepoint(String name) {
      * @param transactionName the name of the transaction
      */
     public void prepareCommit(String transactionName) {
-        if (containsUncommitted()) {
+        if (hasPendingTransaction()) {
             // need to commit even if rollback is not possible (create/drop
             // table and so on)
             database.prepareCommit(this, transactionName);
@@ -1713,7 +1718,7 @@ private static void addTableToDependencies(MVTable table, HashSet<MVMap<Object,V
      */
     public void endStatement() {
         setCurrentCommand(null);
-        if (transaction != null) {
+        if (hasTransaction()) {
             transaction.markStatementEnd();
         }
         startStatement = -1;

h2/src/main/org/h2/table/InformationSchemaTable.java

@@ -2862,7 +2862,7 @@ private void sessions(SessionLocal session, ArrayList<Row> rows, SessionLocal s)
                 // EXECUTING_STATEMENT_START
                 command == null ? null : s.getCommandStartOrEnd(),
                 // CONTAINS_UNCOMMITTED
-                ValueBoolean.get(s.containsUncommitted()),
+                ValueBoolean.get(s.hasPendingTransaction()),
                 // SESSION_STATE
                 String.valueOf(s.getState()),
                 // BLOCKER_ID

h2/src/main/org/h2/table/InformationSchemaTableLegacy.java

@@ -1928,7 +1928,7 @@ public ArrayList<Row> generateRows(SessionLocal session, SearchRow first, Search
                             // STATEMENT_START
                             command == null ? null : s.getCommandStartOrEnd(),
                             // CONTAINS_UNCOMMITTED
-                            ValueBoolean.get(s.containsUncommitted()),
+                            ValueBoolean.get(s.hasPendingTransaction()),
                             // STATE
                             String.valueOf(s.getState()),
                             // BLOCKER_ID