raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

fixing compile errors due to api changes in multiverse

Browse source
This commit is contained in:
Jon-Anders Teigen 2009-10-27 04:25:14 +08:00 • committed by Jonas Bonér
parent a4625b3e6d
commit fe3ee208ae
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-actors/src/main/scala/actor/Actor.scala
View file

@ -21,7 +21,7 @@ import se.scalablesolutions.akka.util.Logging
import org.codehaus.aspectwerkz.joinpoint.{MethodRtti, JoinPoint}
import org.multiverse.utils.TransactionThreadLocal._
import org.multiverse.utils.ThreadLocalTransaction._
sealed abstract class LifecycleMessage
case class Init(config: AnyRef) extends LifecycleMessage

2
akka-actors/src/main/scala/stm/Transaction.scala
View file

@ -12,7 +12,7 @@ import se.scalablesolutions.akka.util.Logging
import org.multiverse.api.{Stm, Transaction => MultiverseTransaction}
import org.multiverse.api.GlobalStmInstance.getGlobalStmInstance
import org.multiverse.utils.TransactionThreadLocal._
import org.multiverse.utils.ThreadLocalTransaction._
import org.multiverse.templates.OrElseTemplate
import scala.collection.mutable.HashMap

2
akka-actors/src/main/scala/stm/TransactionManagement.scala
View file

@ -12,7 +12,7 @@ import org.codehaus.aspectwerkz.proxy.Uuid
import scala.collection.mutable.HashSet
import org.multiverse.utils.TransactionThreadLocal._
import org.multiverse.utils.ThreadLocalTransaction._
class StmException(msg: String) extends RuntimeException(msg)

2
akka-actors/src/main/scala/stm/TransactionalState.scala
View file

@ -77,7 +77,7 @@ object TransactionalRef {
* @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
*/
class TransactionalRef[T] extends Transactional {
import org.multiverse.utils.TransactionThreadLocal._
import org.multiverse.utils.ThreadLocalTransaction._
private[this] val ref: Ref[T] = atomic { new Ref }

10
akka-util-java/src/main/java/se/scalablesolutions/akka/stm/AtomicTemplate.java
View file

@ -9,8 +9,8 @@ import org.multiverse.api.exceptions.LoadException;
import org.multiverse.api.exceptions.RetryError;
import org.multiverse.api.exceptions.TooManyRetriesException;
import static org.multiverse.api.GlobalStmInstance.getGlobalStmInstance;
import static org.multiverse.utils.TransactionThreadLocal.getThreadLocalTransaction;
import static org.multiverse.utils.TransactionThreadLocal.setThreadLocalTransaction;
import static org.multiverse.utils.ThreadLocalTransaction.getThreadLocalTransaction;
import static org.multiverse.utils.ThreadLocalTransaction.setThreadLocalTransaction;
import static java.lang.String.format;
import java.util.logging.Logger;
@ -60,7 +60,7 @@ public abstract class AtomicTemplate<E> {
/**
* Creates a new AtomicTemplate that uses the STM stored in the GlobalStm and works the the {@link
* org.multiverse.utils.TransactionThreadLocal}.
* org.multiverse.utils.ThreadLocalTransaction}.
*/
public AtomicTemplate() {
this(getGlobalStmInstance());
@ -72,7 +72,7 @@ public abstract class AtomicTemplate<E> {
/**
* Creates a new AtomicTemplate using the provided stm. The transaction used is stores/retrieved from the {@link
* org.multiverse.utils.TransactionThreadLocal}.
* org.multiverse.utils.ThreadLocalTransaction}.
*
* @param stm the stm to use for transactions.
* @throws NullPointerException if stm is null.
@ -274,7 +274,7 @@ public abstract class AtomicTemplate<E> {
if (abort) {
t.abort();
if (reset) {
t.reset();
t.restart();
}
}
}