From 71fedd912860c8e74d7db36f7032d4e164eb6131 Mon Sep 17 00:00:00 2001
From: Peter Vlugter <peter@maka>
Date: Sun, 20 Jun 2010 10:10:09 +1200
Subject: [PATCH] Removed isTransactionalityEnabled

---
 akka-core/src/main/scala/actor/ActorRef.scala | 22 ++-----------------
 .../scala/stm/TransactionManagement.scala     |  6 -----
 config/akka-reference.conf                    |  3 +--
 3 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/akka-core/src/main/scala/actor/ActorRef.scala b/akka-core/src/main/scala/actor/ActorRef.scala
index c27bfe161a..a4a1d63490 100644
--- a/akka-core/src/main/scala/actor/ActorRef.scala
+++ b/akka-core/src/main/scala/actor/ActorRef.scala
@@ -1198,7 +1198,7 @@ sealed class LocalActorRef private[akka](
   /**
    * Callback for the dispatcher. This is the ingle entry point to the user Actor implementation.
    */
-  protected[akka] def invoke(messageHandle: MessageInvocation): Unit = actor.synchronized {    
+  protected[akka] def invoke(messageHandle: MessageInvocation): Unit = actor.synchronized {
     if (isShutdown) {
       Actor.log.warning("Actor [%s] is shut down, ignoring message [%s]", toString, messageHandle)
       return
@@ -1206,8 +1206,7 @@ sealed class LocalActorRef private[akka](
     sender = messageHandle.sender
     senderFuture = messageHandle.senderFuture
     try {
-      if (TransactionManagement.isTransactionalityEnabled) transactionalDispatch(messageHandle)
-      else dispatch(messageHandle)
+      dispatch(messageHandle)
     } catch {
       case e =>
         Actor.log.error(e, "Could not invoke actor [%s]", this)
@@ -1216,23 +1215,6 @@ sealed class LocalActorRef private[akka](
   }
 
   private def dispatch[T](messageHandle: MessageInvocation) = {
-    val message = messageHandle.message //serializeMessage(messageHandle.message)
-    setTransactionSet(messageHandle.transactionSet)
-    try {
-      actor.base(message)
-    } catch {
-      case e =>
-        _isBeingRestarted = true
-        Actor.log.error(e, "Could not invoke actor [%s]", toString)
-        // FIXME to fix supervisor restart of remote actor for oneway calls, inject a supervisor proxy that can send notification back to client
-        if (_supervisor.isDefined) _supervisor.get ! Exit(this, e)
-        senderFuture.foreach(_.completeWithException(this, e))
-    } finally {
-      clearTransaction
-    }
-  }
-
-  private def transactionalDispatch[T](messageHandle: MessageInvocation) = {
     val message = messageHandle.message //serializeMessage(messageHandle.message)
     var topLevelTransaction = false
     val txSet: Option[CountDownCommitBarrier] =
diff --git a/akka-core/src/main/scala/stm/TransactionManagement.scala b/akka-core/src/main/scala/stm/TransactionManagement.scala
index 2b4b9f888c..44cb76a6d3 100644
--- a/akka-core/src/main/scala/stm/TransactionManagement.scala
+++ b/akka-core/src/main/scala/stm/TransactionManagement.scala
@@ -23,15 +23,9 @@ class TransactionAwareWrapperException(val cause: Throwable, val tx: Option[Tran
 object TransactionManagement extends TransactionManagement {
   import se.scalablesolutions.akka.config.Config._
 
-  // is this needed?
-  val TRANSACTION_ENABLED = new AtomicBoolean(config.getBool("akka.stm.service", true))
   // move to stm.global.fair?
   val FAIR_TRANSACTIONS = config.getBool("akka.stm.fair", true)
 
-  def isTransactionalityEnabled = TRANSACTION_ENABLED.get
-
-  def disableTransactions = TRANSACTION_ENABLED.set(false)
-
   private[akka] val transactionSet = new ThreadLocal[Option[CountDownCommitBarrier]]() {
     override protected def initialValue: Option[CountDownCommitBarrier] = None
   }
diff --git a/config/akka-reference.conf b/config/akka-reference.conf
index f7f9f0abc5..e20a745ca1 100644
--- a/config/akka-reference.conf
+++ b/config/akka-reference.conf
@@ -31,8 +31,7 @@
   </actor>
 
   <stm>
-    service = on
-    fair = on                # should transactions be fair or non-fair (non fair yield better performance)
+    fair = on                # should global transactions be fair or non-fair (non fair yield better performance)
     jta-aware = off          # 'on' means that if there JTA Transaction Manager available then the STM will
                              # begin (or join), commit or rollback the JTA transaction. Default is 'off'.
   </stm>