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

Upgraded to latest Mulitverse SNAPSHOT

Browse source
This commit is contained in:
jboner 2009-11-25 20:37:00 +01:00
parent 2f12275a3c
commit 4318d68af4
5 changed files with 16 additions and 11 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.proxy.Uuid
import org.multiverse.utils.ThreadLocalTransaction._
import org.multiverse.api.ThreadLocalTransaction._
/**
* Mix in this trait to give an actor TransactionRequired semantics.

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.ThreadLocalTransaction._
import org.multiverse.api.ThreadLocalTransaction._
import org.multiverse.templates.OrElseTemplate
import scala.collection.mutable.HashMap

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

@ -10,7 +10,7 @@ import se.scalablesolutions.akka.util.Logging
import scala.collection.mutable.HashSet
import org.multiverse.utils.ThreadLocalTransaction._
import org.multiverse.api.ThreadLocalTransaction._
class StmException(msg: String) extends RuntimeException(msg)

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

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

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

@ -1,16 +1,18 @@
package se.scalablesolutions.akka.stm;
import org.multiverse.templates.AbortedException;
import static org.multiverse.api.GlobalStmInstance.getGlobalStmInstance;
import org.multiverse.api.Stm;
import static org.multiverse.api.ThreadLocalTransaction.getThreadLocalTransaction;
import static org.multiverse.api.ThreadLocalTransaction.setThreadLocalTransaction;
import org.multiverse.api.Transaction;
import org.multiverse.api.TransactionStatus;
import org.multiverse.api.exceptions.CommitFailureException;
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.ThreadLocalTransaction.getThreadLocalTransaction;
import static org.multiverse.utils.ThreadLocalTransaction.setThreadLocalTransaction;
import org.multiverse.templates.AbortedException;
import org.multiverse.utils.latches.CheapLatch;
import org.multiverse.utils.latches.Latch;
import static java.lang.String.format;
import java.util.logging.Logger;
@ -259,7 +261,9 @@ public abstract class AtomicTemplate<E> {
postCommit();
return result;
} catch (RetryError e) {
t.abortAndWaitForRetry();
Latch latch = new CheapLatch();
t.abortAndRegisterRetryLatch(latch);
latch.awaitUninterruptible();
//since the abort is already done, no need to do it again.
abort = false;
} catch (CommitFailureException ex) {
@ -274,7 +278,8 @@ public abstract class AtomicTemplate<E> {
if (abort) {
t.abort();
if (reset) {
t.restart();
t = t.abortAndReturnRestarted();
setTransaction(t);
}
}
}
@ -333,4 +338,4 @@ public abstract class AtomicTemplate<E> {
return (Exception) super.getCause();
}
}
}
}