TransactionManagerCommon.java (hsqldb-2.7.0) | : | TransactionManagerCommon.java (hsqldb-2.7.1) | ||
---|---|---|---|---|
skipping to change at line 53 | skipping to change at line 53 | |||
import org.hsqldb.lib.Iterator; | import org.hsqldb.lib.Iterator; | |||
import org.hsqldb.lib.LongDeque; | import org.hsqldb.lib.LongDeque; | |||
import org.hsqldb.lib.LongKeyHashMap; | import org.hsqldb.lib.LongKeyHashMap; | |||
import org.hsqldb.lib.MultiValueHashMap; | import org.hsqldb.lib.MultiValueHashMap; | |||
import org.hsqldb.lib.OrderedHashSet; | import org.hsqldb.lib.OrderedHashSet; | |||
/** | /** | |||
* Shared code for TransactionManager classes | * Shared code for TransactionManager classes | |||
* | * | |||
* @author Fred Toussi (fredt@users dot sourceforge.net) | * @author Fred Toussi (fredt@users dot sourceforge.net) | |||
* @version 2.7.0 | * @version 2.7.1 | |||
* @since 2.0.0 | * @since 2.0.0 | |||
*/ | */ | |||
class TransactionManagerCommon { | class TransactionManagerCommon { | |||
Database database; | Database database; | |||
Session lobSession; | Session lobSession; | |||
int txModel; | int txModel; | |||
HsqlName[] catalogNameList; | HsqlName[] catalogNameList; | |||
// | // | |||
skipping to change at line 965 | skipping to change at line 965 | |||
if (session != targetSession) { | if (session != targetSession) { | |||
break; | break; | |||
} | } | |||
if (!targetSession.isInMidTransaction()) { | if (!targetSession.isInMidTransaction()) { | |||
targetSession.resetSession(); | targetSession.resetSession(); | |||
} | } | |||
break; | break; | |||
case TransactionManager.resetSessionRollback : | case TransactionManager.resetSessionRollback : | |||
if (session == targetSession) { | ||||
break; | ||||
} | ||||
if (targetSession.isInMidTransaction()) { | if (targetSession.isInMidTransaction()) { | |||
prepareReset(targetSession); | prepareReset(targetSession); | |||
targetSession.abortTransaction = true; | targetSession.abortTransaction = true; | |||
if (targetSession.latch.getCount() > 0) { | if (targetSession.latch.getCount() > 0) { | |||
targetSession.latch.setCount(0); | targetSession.latch.setCount(0); | |||
} else { | } else { | |||
targetSession.rollbackNoCheck(true); | targetSession.rollbackNoCheck(true); | |||
} | } | |||
End of changes. 2 change blocks. | ||||
5 lines changed or deleted | 1 lines changed or added |