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

TransactionGuardImpl: don't cancel nested transactions for now

Browse Source
This commit is contained in:
peter
2016-02-29 19:41:44 +01:00
parent bd6cfed4ec
commit 9825463477
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/openapi/application/TransactionGuardImpl.java
+4 -1
View File
@@ -15,6 +15,7 @@
*/
package com.intellij.openapi.application;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.util.concurrency.Semaphore;
import com.intellij.util.containers.ContainerUtil;
@@ -29,6 +30,7 @@ import java.util.concurrent.LinkedBlockingQueue;
* @author peter
*/
public class TransactionGuardImpl extends TransactionGuard {
private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.application.TransactionGuardImpl");
private final Queue<Runnable> myQueue = new LinkedBlockingQueue<Runnable>();
private final Set<TransactionKind> myMergeableKinds = ContainerUtil.newHashSet();
private boolean myInsideTransaction;
@@ -41,7 +43,8 @@ public class TransactionGuardImpl extends TransactionGuard {
return AccessToken.EMPTY_ACCESS_TOKEN;
}
if (myInsideTransaction) {
throw new IllegalStateException("Nested transactions are not allowed");
LOG.error("Nested transactions are not allowed");
//throw new IllegalStateException("Nested transactions are not allowed");
}
myInsideTransaction = true;
return new AccessToken() {