Fixed deadlock when Transactor is restarted in the middle of a transaction

akka-core/src/main/scala/util/LockUtil.scala

@@ -10,7 +10,7 @@ import java.util.concurrent.locks.{ReentrantReadWriteLock, ReentrantLock}
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
  */
 class ReentrantGuard {
-  private val lock = new ReentrantLock
+  val lock = new ReentrantLock
 
   def withGuard[T](body: => T): T = {
     lock.lock
@@ -20,6 +20,15 @@ class ReentrantGuard {
       lock.unlock
     }
   }
+
+  def tryWithGuard[T](body: => T): T = {
+    while(!lock.tryLock) { Thread.sleep(10) } // wait on the monitor to be unlocked
+    try {
+      body
+    } finally {
+      lock.unlock
+    }
+  }
 }
 
 /**