From 982546347715de8d9fd0eef8e47cbc2a089de2e2 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Mon, 29 Feb 2016 19:41:04 +0100
Subject: [PATCH] TransactionGuardImpl: don't cancel nested transactions for
 now

---
 .../intellij/openapi/application/TransactionGuardImpl.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/platform/core-impl/src/com/intellij/openapi/application/TransactionGuardImpl.java b/platform/core-impl/src/com/intellij/openapi/application/TransactionGuardImpl.java
index beeef76cc522..6384791c2358 100644
--- a/platform/core-impl/src/com/intellij/openapi/application/TransactionGuardImpl.java
+++ b/platform/core-impl/src/com/intellij/openapi/application/TransactionGuardImpl.java
@@ -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() {