MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

don't lose submitted transactions

Browse Source
This commit is contained in:
peter
2016-04-23 11:45:53 +02:00
parent 94d2975a40
commit b9ec9bb6a1
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/openapi/application/TransactionGuardImpl.java
+3 -9
View File
@@ -60,6 +60,7 @@ public class TransactionGuardImpl extends TransactionGuard {
public void finish() {
Queue<Transaction> queue = getQueue(prevTransaction);
queue.addAll(myCurrentTransaction.myQueue);
myCurrentTransaction.myQueue = queue;
if (!queue.isEmpty()) {
pollQueueLater();
}
@@ -72,14 +73,7 @@ public class TransactionGuardImpl extends TransactionGuard {
@NotNull
private Queue<Transaction> getQueue(@Nullable TransactionIdImpl transaction) {
if (transaction == null) {
return myQueue;
}
if (myCurrentTransaction != null && transaction.myStartCounter > myCurrentTransaction.myStartCounter) {
// transaction is finished already, it makes no sense to add to its queue
return myCurrentTransaction.myQueue;
}
return transaction.myQueue;
return transaction == null ? myQueue : transaction.myQueue;
}
private void pollQueueLater() {
@@ -304,7 +298,7 @@ public class TransactionGuardImpl extends TransactionGuard {
private static class TransactionIdImpl implements TransactionId {
private static final AtomicLong ourTransactionCounter = new AtomicLong();
final long myStartCounter = ourTransactionCounter.getAndIncrement();
final Queue<Transaction> myQueue = new LinkedBlockingQueue<Transaction>();
Queue<Transaction> myQueue = new LinkedBlockingQueue<Transaction>();
@Override
public String toString() {
platform/platform-tests/testSrc/com/intellij/application/TransactionTest.groovy
+14
View File
@@ -216,4 +216,18 @@ class TransactionTest extends LightPlatformTestCase {
assert log == ['1', '2', '3', '4', '5']
}
public void "test don't add transaction to outdated queue"() {
TransactionGuard.submitTransaction testRootDisposable, {
log << '1'
guard.submitTransactionLater testRootDisposable, { log << '3' }
log << '2'
}
TransactionGuard.submitTransaction testRootDisposable, {
UIUtil.dispatchAllInvocationEvents()
assert log == ['1', '2']
}
UIUtil.dispatchAllInvocationEvents()
assert log == ['1', '2', '3']
}
}