JBoss Cache SVN: r8573 - core/support-branches/3.2.8.GA_JBCACHE-1612_JBCACHE-JBCACHE-1613/src/main/java/org/jboss/cache/interceptors.
by jbosscache-commits＠lists.jboss.org
Author: dereed
Date: 2013-07-05 17:28:33 -0400 (Fri, 05 Jul 2013)
New Revision: 8573
Modified:
core/support-branches/3.2.8.GA_JBCACHE-1612_JBCACHE-JBCACHE-1613/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java
Log:
Backport JBCACHE-1613
Modified: core/support-branches/3.2.8.GA_JBCACHE-1612_JBCACHE-JBCACHE-1613/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java
===================================================================
--- core/support-branches/3.2.8.GA_JBCACHE-1612_JBCACHE-JBCACHE-1613/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java 2013-07-05 21:14:51 UTC (rev 8572)
+++ core/support-branches/3.2.8.GA_JBCACHE-1612_JBCACHE-JBCACHE-1613/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java 2013-07-05 21:28:33 UTC (rev 8573)
@@ -896,26 +896,43 @@
public void beforeCompletion()
{
- if (trace) log.trace("Running beforeCompletion on gtx " + gtx);
+ beforeCompletion(true);
+ }
- if (transactionContext == null)
+ // resetInvocationContext=false should be used by sub classes that call
+ // invocationContextContainer.remove themselves
+ protected void beforeCompletion(boolean resetInvocationContext)
+ {
+ try
{
- log.error("Transaction has a null transaction entry - beforeCompletion() will fail.");
- throw new IllegalStateException("cannot find transaction entry for " + gtx);
- }
+ if (trace) log.trace("Running beforeCompletion on gtx " + gtx);
- modifications = transactionContext.getModifications();
- ctx = invocationContextContainer.get();
- setTransactionalContext(tx, gtx, transactionContext, ctx);
+ if (transactionContext == null)
+ {
+ log.error("Transaction has a null transaction entry - beforeCompletion() will fail.");
+ throw new IllegalStateException("cannot find transaction entry for " + gtx);
+ }
- if (ctx.isOptionsUninitialised() && transactionContext.getOption() != null)
+ modifications = transactionContext.getModifications();
+ ctx = invocationContextContainer.get();
+ setTransactionalContext(tx, gtx, transactionContext, ctx);
+
+ if (ctx.isOptionsUninitialised() && transactionContext.getOption() != null)
+ {
+ ctx.setOptionOverrides(transactionContext.getOption());
+ }
+
+ assertCanContinue();
+
+ ctx.setOriginLocal(false);
+ }
+ finally
{
- ctx.setOptionOverrides(transactionContext.getOption());
+ // JBCACHE-1613: remove the ThreadLocal reference to ctx, in case a different
+ // thread calls afterCompletion
+ if(resetInvocationContext)
+ invocationContextContainer.remove();
}
-
- assertCanContinue();
-
- ctx.setOriginLocal(false);
}
// this should really not be done here -
@@ -935,6 +952,10 @@
}
}
+ // JBCACHE-1613: Make sure our ThreadLocal is set to ctx, in case beforeCompletion
+ // was called with a different thread
+ invocationContextContainer.set(ctx);
+
try
{
assertCanContinue();
@@ -1068,78 +1089,87 @@
@Override
public void beforeCompletion()
{
- super.beforeCompletion();
- ctx.setOriginLocal(!remoteLocal); // this is the LOCAL sync handler after all!
- // fetch the modifications before the transaction is committed
- // (and thus removed from the txTable)
- setTransactionalContext(tx, gtx, transactionContext, ctx);
- if (!transactionContext.hasModifications())
+ try
{
- if (trace) log.trace("No modifications in this tx. Skipping beforeCompletion()");
- modifications = Collections.emptyList();
- return;
- }
- else
- {
- modifications = transactionContext.getModifications();
- }
+ super.beforeCompletion(false);
+ ctx.setOriginLocal(!remoteLocal); // this is the LOCAL sync handler after all!
+ // fetch the modifications before the transaction is committed
+ // (and thus removed from the txTable)
+ setTransactionalContext(tx, gtx, transactionContext, ctx);
+ if (!transactionContext.hasModifications())
+ {
+ if (trace) log.trace("No modifications in this tx. Skipping beforeCompletion()");
+ modifications = Collections.emptyList();
+ return;
+ }
+ else
+ {
+ modifications = transactionContext.getModifications();
+ }
- // set any transaction wide options as current for this thread, caching original options that would then be reset
- originalOptions = ctx.getOptionOverrides();
- transactionalOptions = transactionContext.getOption();
- transactionalOptions.setSuppressEventNotification(originalOptions.isSuppressEventNotification());
- ctx.setOptionOverrides(transactionalOptions);
+ // set any transaction wide options as current for this thread, caching original options that would then be reset
+ originalOptions = ctx.getOptionOverrides();
+ transactionalOptions = transactionContext.getOption();
+ transactionalOptions.setSuppressEventNotification(originalOptions.isSuppressEventNotification());
+ ctx.setOptionOverrides(transactionalOptions);
- try
- {
- switch (tx.getStatus())
+ try
{
- // if we are active or preparing then we can go ahead
- case Status.STATUS_ACTIVE:
- case Status.STATUS_PREPARING:
- // run a prepare call.
+ switch (tx.getStatus())
+ {
+ // if we are active or preparing then we can go ahead
+ case Status.STATUS_ACTIVE:
+ case Status.STATUS_PREPARING:
+ // run a prepare call.
- Object result = isOnePhaseCommit() ? null : runPreparePhase(ctx, gtx, modifications);
+ Object result = isOnePhaseCommit() ? null : runPreparePhase(ctx, gtx, modifications);
- if (result instanceof Throwable)
- {
- if (log.isDebugEnabled())
+ if (result instanceof Throwable)
{
- log.debug("Transaction needs to be rolled back - the cache returned an instance of Throwable for this prepare call (tx=" + tx + " and gtx=" + gtx + ")", (Throwable) result);
+ if (log.isDebugEnabled())
+ {
+ log.debug("Transaction needs to be rolled back - the cache returned an instance of Throwable for this prepare call (tx=" + tx + " and gtx=" + gtx + ")", (Throwable) result);
+ }
+ tx.setRollbackOnly();
+ throw (Throwable) result;
}
- tx.setRollbackOnly();
- throw (Throwable) result;
- }
- break;
- default:
- throw new CacheException("transaction " + tx + " in status " + tx.getStatus() + " unable to start transaction");
+ break;
+ default:
+ throw new CacheException("transaction " + tx + " in status " + tx.getStatus() + " unable to start transaction");
+ }
}
- }
- catch (Throwable t)
- {
- if (log.isWarnEnabled()) log.warn("Caught exception, will now set transaction to roll back", t);
- try
+ catch (Throwable t)
{
- tx.setRollbackOnly();
+ if (log.isWarnEnabled()) log.warn("Caught exception, will now set transaction to roll back", t);
+ try
+ {
+ tx.setRollbackOnly();
+ }
+ catch (SystemException se)
+ {
+ throw new RuntimeException("setting tx rollback failed ", se);
+ }
+ if (t instanceof RuntimeException)
+ {
+ throw (RuntimeException) t;
+ }
+ else
+ {
+ throw new RuntimeException("", t);
+ }
}
- catch (SystemException se)
+ finally
{
- throw new RuntimeException("setting tx rollback failed ", se);
+ localRollbackOnly = false;
+ setTransactionalContext(null, null, null, ctx);
+ ctx.setOptionOverrides(originalOptions);
}
- if (t instanceof RuntimeException)
- {
- throw (RuntimeException) t;
- }
- else
- {
- throw new RuntimeException("", t);
- }
}
finally
{
- localRollbackOnly = false;
- setTransactionalContext(null, null, null, ctx);
- ctx.setOptionOverrides(originalOptions);
+ // JBCACHE-1613: remove the ThreadLocal reference to ctx, in case a different
+ // thread calls afterCompletion
+ invocationContextContainer.remove();
}
}
11 years, 5 months
- 1
- 0
JBoss Cache SVN: r8572 - in core/support-branches/3.2.8.GA_JBCACHE-1612_JBCACHE-JBCACHE-1613: src/main/java/org/jboss/cache and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: dereed
Date: 2013-07-05 17:14:51 -0400 (Fri, 05 Jul 2013)
New Revision: 8572
Modified:
core/support-branches/3.2.8.GA_JBCACHE-1612_JBCACHE-JBCACHE-1613/pom.xml
core/support-branches/3.2.8.GA_JBCACHE-1612_JBCACHE-JBCACHE-1613/src/main/java/org/jboss/cache/Version.java
Log:
[JBPAPP-10808] Update version
Modified: core/support-branches/3.2.8.GA_JBCACHE-1612_JBCACHE-JBCACHE-1613/pom.xml
===================================================================
--- core/support-branches/3.2.8.GA_JBCACHE-1612_JBCACHE-JBCACHE-1613/pom.xml 2013-07-05 21:05:21 UTC (rev 8571)
+++ core/support-branches/3.2.8.GA_JBCACHE-1612_JBCACHE-JBCACHE-1613/pom.xml 2013-07-05 21:14:51 UTC (rev 8572)
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
- <jbosscache-core-version>3.2.8.GA_JBPAPP-7852</jbosscache-core-version>
+ <jbosscache-core-version>3.2.8.GA_JBCACHE-1612_JBCACHE-1613</jbosscache-core-version>
<!-- By default only run tests in the "unit" group -->
<defaultTestGroup>unit</defaultTestGroup>
<!-- By default only generate Javadocs when we install the module. -->
Modified: core/support-branches/3.2.8.GA_JBCACHE-1612_JBCACHE-JBCACHE-1613/src/main/java/org/jboss/cache/Version.java
===================================================================
--- core/support-branches/3.2.8.GA_JBCACHE-1612_JBCACHE-JBCACHE-1613/src/main/java/org/jboss/cache/Version.java 2013-07-05 21:05:21 UTC (rev 8571)
+++ core/support-branches/3.2.8.GA_JBCACHE-1612_JBCACHE-JBCACHE-1613/src/main/java/org/jboss/cache/Version.java 2013-07-05 21:14:51 UTC (rev 8572)
@@ -32,10 +32,10 @@
@Immutable
public class Version
{
- public static final String version = "3.2.8.GA_JBPAPP-7852";
+ public static final String version = "3.2.8.GA_JBCACHE-1612_JBCACHE-1613";
public static final String codename = "Malagueta";
//public static final String cvs = "$Id$";
- static final byte[] version_id = {'0','3','2','8','G','A','J','B','P','A','P','P','-','7','8','5','2'};
+ static final byte[] version_id = {'0','3','2','8','G','A','_','J','B','C','A','C','H','E','-','1','6','1','2','_','J','B','C','A','C','H','E','-','1','6','1','3'};
private static final int MAJOR_SHIFT = 11;
private static final int MINOR_SHIFT = 6;
11 years, 5 months
- 1
- 0
JBoss Cache SVN: r8571 - core/support-branches.
by jbosscache-commits＠lists.jboss.org
Author: dereed
Date: 2013-07-05 17:05:21 -0400 (Fri, 05 Jul 2013)
New Revision: 8571
Added:
core/support-branches/3.2.8.GA_JBCACHE-1612_JBCACHE-JBCACHE-1613/
Log:
[JBPAPP-10808] Backport JBPAPP-9220 and JBPAPP-7850 to EAP 5.1.2
11 years, 5 months
- 1
- 0
- ← Newer
- 1
- Older →