[infinispan-commits] Infinispan SVN: r272 - in trunk/core/src/main/java/org/infinispan: context and 5 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Wed May 13 02:44:19 EDT 2009
Author: mircea.markus
Date: 2009-05-13 02:44:19 -0400 (Wed, 13 May 2009)
New Revision: 272
Modified:
trunk/core/src/main/java/org/infinispan/commands/tx/AbstractTransactionBoundaryCommand.java
trunk/core/src/main/java/org/infinispan/context/InvocationContextContainerImpl.java
trunk/core/src/main/java/org/infinispan/interceptors/TxInterceptor.java
trunk/core/src/main/java/org/infinispan/interceptors/base/BaseRpcInterceptor.java
trunk/core/src/main/java/org/infinispan/remoting/rpc/CacheRpcManager.java
trunk/core/src/main/java/org/infinispan/transaction/tm/DummyTransaction.java
trunk/core/src/main/java/org/infinispan/transaction/tm/DummyUserTransaction.java
trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionXaAdapter.java
Log:
cached log.isTraceEnabled statements
Modified: trunk/core/src/main/java/org/infinispan/commands/tx/AbstractTransactionBoundaryCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/tx/AbstractTransactionBoundaryCommand.java 2009-05-13 05:56:43 UTC (rev 271)
+++ trunk/core/src/main/java/org/infinispan/commands/tx/AbstractTransactionBoundaryCommand.java 2009-05-13 06:44:19 UTC (rev 272)
@@ -41,6 +41,7 @@
public abstract class AbstractTransactionBoundaryCommand implements TransactionBoundaryCommand {
private static Log log = LogFactory.getLog(AbstractTransactionBoundaryCommand.class);
+ private static boolean trace = log.isTraceEnabled();
protected GlobalTransaction globalTx;
protected String cacheName;
@@ -75,7 +76,7 @@
if (ctx != null) throw new IllegalStateException("Expected null context!");
RemoteTransaction transaction = txTable.getRemoteTransaction(globalTx);
if (transaction == null) {
- if (log.isInfoEnabled()) log.info("Not found RemoteTransaction for tx id: " + globalTx);
+ if (trace) log.info("Not found RemoteTransaction for tx id: " + globalTx);
return null;
}
RemoteTxInvocationContext ctxt = icc.getRemoteTxInvocationContext();
Modified: trunk/core/src/main/java/org/infinispan/context/InvocationContextContainerImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/context/InvocationContextContainerImpl.java 2009-05-13 05:56:43 UTC (rev 271)
+++ trunk/core/src/main/java/org/infinispan/context/InvocationContextContainerImpl.java 2009-05-13 06:44:19 UTC (rev 272)
@@ -26,11 +26,9 @@
import org.infinispan.context.impl.NonTxInvocationContext;
import org.infinispan.context.impl.RemoteTxInvocationContext;
import org.infinispan.factories.annotations.Inject;
-import org.infinispan.transaction.xa.TransactionXaAdapter;
import org.infinispan.transaction.xa.GlobalTransaction;
import org.infinispan.transaction.xa.TransactionTable;
-import org.infinispan.util.logging.Log;
-import org.infinispan.util.logging.LogFactory;
+import org.infinispan.transaction.xa.TransactionXaAdapter;
import javax.transaction.SystemException;
import javax.transaction.Transaction;
@@ -47,8 +45,6 @@
*/
public class InvocationContextContainerImpl implements InvocationContextContainer {
- private static Log log = LogFactory.getLog(InvocationContextContainerImpl.class);
-
private TransactionManager tm;
private TransactionTable transactionTable;
Modified: trunk/core/src/main/java/org/infinispan/interceptors/TxInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/TxInterceptor.java 2009-05-13 05:56:43 UTC (rev 271)
+++ trunk/core/src/main/java/org/infinispan/interceptors/TxInterceptor.java 2009-05-13 06:44:19 UTC (rev 272)
@@ -200,7 +200,7 @@
private boolean isLocalModeForced(InvocationContext icx) {
if (icx.hasFlag(Flag.CACHE_MODE_LOCAL)) {
- if (log.isDebugEnabled()) log.debug("LOCAL mode forced on invocation. Suppressing clustered events.");
+ if (trace) log.debug("LOCAL mode forced on invocation. Suppressing clustered events.");
return true;
}
return false;
Modified: trunk/core/src/main/java/org/infinispan/interceptors/base/BaseRpcInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/base/BaseRpcInterceptor.java 2009-05-13 05:56:43 UTC (rev 271)
+++ trunk/core/src/main/java/org/infinispan/interceptors/base/BaseRpcInterceptor.java 2009-05-13 06:44:19 UTC (rev 272)
@@ -60,7 +60,7 @@
protected final boolean isLocalModeForced(InvocationContext ctx) {
if (ctx.hasFlag(Flag.CACHE_MODE_LOCAL)) {
- if (log.isDebugEnabled()) log.debug("LOCAL mode forced on invocation. Suppressing clustered events.");
+ if (trace) log.debug("LOCAL mode forced on invocation. Suppressing clustered events.");
return true;
}
return false;
Modified: trunk/core/src/main/java/org/infinispan/remoting/rpc/CacheRpcManager.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/rpc/CacheRpcManager.java 2009-05-13 05:56:43 UTC (rev 271)
+++ trunk/core/src/main/java/org/infinispan/remoting/rpc/CacheRpcManager.java 2009-05-13 06:44:19 UTC (rev 272)
@@ -25,6 +25,7 @@
public class CacheRpcManager {
private static Log log = LogFactory.getLog(CacheRpcManager.class);
+ private static final boolean trace = log.isTraceEnabled();
private Configuration configuration;
private boolean stateTransferEnabled;
@@ -69,7 +70,7 @@
}
public void multicastRpcCommand(List<Address> recipients, CacheRpcCommand command, boolean sync, boolean useOutOfBandMessage) throws ReplicationException {
- if (log.isTraceEnabled()) {
+ if (trace) {
log.trace("invoking method " + command.getClass().getSimpleName() + ", members=" + rpcManager.getTransport().getMembers() + ", mode=" +
configuration.getCacheMode() + ", exclude_self=" + true + ", timeout=" +
configuration.getSyncReplTimeout());
@@ -83,7 +84,7 @@
sync ? ResponseMode.SYNCHRONOUS : ResponseMode.ASYNCHRONOUS, // is synchronised?
configuration.getSyncReplTimeout(), useOutOfBandMessage, stateTransferEnabled
);
- if (log.isTraceEnabled()) log.trace("responses=" + rsps);
+ if (trace) log.trace("responses=" + rsps);
if (sync) checkResponses(rsps);
} catch (CacheException e) {
log.error("Replication exception",e);
@@ -112,8 +113,8 @@
if (rsp != null && rsp instanceof Throwable) {
// lets print a stack trace first.
Throwable throwable = (Throwable) rsp;
- if (log.isDebugEnabled()) {
- log.debug("Received Throwable from remote cache", throwable);
+ if (trace) {
+ log.trace("Received Throwable from remote cache", throwable);
}
throw new ReplicationException(throwable);
}
Modified: trunk/core/src/main/java/org/infinispan/transaction/tm/DummyTransaction.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/tm/DummyTransaction.java 2009-05-13 05:56:43 UTC (rev 271)
+++ trunk/core/src/main/java/org/infinispan/transaction/tm/DummyTransaction.java 2009-05-13 06:44:19 UTC (rev 272)
@@ -45,8 +45,10 @@
* @since 4.0
*/
public class DummyTransaction implements Transaction {
+ private static final Log log = LogFactory.getLog(DummyTransaction.class);
+ private static boolean trace = log.isTraceEnabled();
+
private volatile int status = Status.STATUS_UNKNOWN;
- private static final Log log = LogFactory.getLog(DummyTransaction.class);
protected DummyBaseTransactionManager tm_;
protected DummyXid xid = new DummyXid();
@@ -239,8 +241,8 @@
throw new IllegalStateException("illegal status: " + status + " tx=" + this);
}
- if (log.isDebugEnabled()) {
- log.debug("registering synchronization handler " + sync);
+ if (trace) {
+ log.trace("registering synchronization handler " + sync);
}
syncs.add(sync);
@@ -250,8 +252,8 @@
boolean retval = true;
if (syncs == null) return true;
for (Synchronization s : syncs) {
- if (log.isDebugEnabled()) {
- log.debug("processing beforeCompletion for " + s);
+ if (trace) {
+ log.trace("processing beforeCompletion for " + s);
}
try {
s.beforeCompletion();
@@ -284,8 +286,8 @@
protected void notifyAfterCompletion(int status) {
if (syncs == null) return;
for (Synchronization s : syncs) {
- if (log.isDebugEnabled()) {
- log.debug("processing afterCompletion for " + s);
+ if (trace) {
+ log.trace("processing afterCompletion for " + s);
}
try {
s.afterCompletion(status);
Modified: trunk/core/src/main/java/org/infinispan/transaction/tm/DummyUserTransaction.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/tm/DummyUserTransaction.java 2009-05-13 05:56:43 UTC (rev 271)
+++ trunk/core/src/main/java/org/infinispan/transaction/tm/DummyUserTransaction.java 2009-05-13 06:44:19 UTC (rev 272)
@@ -22,9 +22,6 @@
package org.infinispan.transaction.tm;
-import org.infinispan.util.logging.Log;
-import org.infinispan.util.logging.LogFactory;
-
import javax.transaction.HeuristicMixedException;
import javax.transaction.HeuristicRollbackException;
import javax.transaction.NotSupportedException;
@@ -43,8 +40,7 @@
* @since 4.0
*/
public class DummyUserTransaction implements UserTransaction, java.io.Serializable {
- static final Log logger_ = LogFactory.getLog(DummyUserTransaction.class);
- DummyTransactionManager tm_;
+ DummyTransactionManager tm;
private static final long serialVersionUID = -6568400755677046127L;
/**
@@ -53,7 +49,7 @@
List<Synchronization> l = new ArrayList<Synchronization>();
public DummyUserTransaction(DummyTransactionManager tm) {
- tm_ = tm;
+ this.tm = tm;
}
@@ -65,7 +61,7 @@
* @throws SystemException If the transaction service fails in an unexpected way.
*/
public void begin() throws NotSupportedException, SystemException {
- tm_.begin();
+ tm.begin();
}
/**
@@ -83,7 +79,7 @@
throws RollbackException, HeuristicMixedException,
HeuristicRollbackException, SecurityException, SystemException {
- tm_.commit();
+ tm.commit();
}
/**
@@ -95,7 +91,7 @@
* @throws SystemException If the transaction service fails in an unexpected way.
*/
public void rollback() throws IllegalStateException, SystemException {
- tm_.rollback();
+ tm.rollback();
}
/**
@@ -105,7 +101,7 @@
* @throws SystemException If the transaction service fails in an unexpected way.
*/
public void setRollbackOnly() throws IllegalStateException, SystemException {
- tm_.setRollbackOnly();
+ tm.setRollbackOnly();
}
/**
@@ -115,7 +111,7 @@
* @throws SystemException If the transaction service fails in an unexpected way.
*/
public int getStatus() throws SystemException {
- return tm_.getStatus();
+ return tm.getStatus();
}
/**
Modified: trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionXaAdapter.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionXaAdapter.java 2009-05-13 05:56:43 UTC (rev 271)
+++ trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionXaAdapter.java 2009-05-13 06:44:19 UTC (rev 272)
@@ -33,6 +33,7 @@
public class TransactionXaAdapter implements CacheTransaction, XAResource {
private static Log log = LogFactory.getLog(TransactionXaAdapter.class);
+ private static boolean trace = log.isTraceEnabled();
private int txTimeout;
@@ -70,13 +71,13 @@
public int prepare(Xid xid) throws XAException {
if (configuration.isOnePhaseCommit()) {
- if (log.isTraceEnabled())
+ if (trace)
log.trace("Recieved prepare for tx: " + xid + " . Skipping call as 1PC will be used.");
return XA_OK;
}
PrepareCommand prepareCommand = commandsFactory.buildPrepareCommand(globalTx, modifications, configuration.isOnePhaseCommit());
- if (log.isTraceEnabled()) log.trace("Sending prepare command through the chain: " + prepareCommand);
+ if (trace) log.trace("Sending prepare command through the chain: " + prepareCommand);
LocalTxInvocationContext ctx = icc.getLocalTxInvocationContext();
ctx.setXaCache(this);
@@ -90,12 +91,12 @@
}
public void commit(Xid xid, boolean b) throws XAException {
- if (log.isTraceEnabled()) log.trace("commiting TransactionXaAdapter: " + globalTx);
+ if (trace) log.trace("commiting TransactionXaAdapter: " + globalTx);
try {
LocalTxInvocationContext ctx = icc.getLocalTxInvocationContext();
ctx.setXaCache(this);
if (configuration.isOnePhaseCommit()) {
- if (log.isTraceEnabled()) log.trace("Doing an 1PC prepare call on the interceptor chain");
+ if (trace) log.trace("Doing an 1PC prepare call on the interceptor chain");
PrepareCommand command = commandsFactory.buildPrepareCommand(globalTx, modifications, true);
try {
invoker.invoke(ctx, command);
@@ -134,19 +135,19 @@
}
public void start(Xid xid, int i) throws XAException {
- if (log.isTraceEnabled()) log.trace("start called");
+ if (trace) log.trace("start called");
}
public void end(Xid xid, int i) throws XAException {
- if (log.isTraceEnabled()) log.trace("end called");
+ if (trace) log.trace("end called");
}
public void forget(Xid xid) throws XAException {
- if (log.isTraceEnabled()) log.trace("forget called");
+ if (trace) log.trace("forget called");
}
public int getTransactionTimeout() throws XAException {
- if (log.isTraceEnabled()) log.trace("start called");
+ if (trace) log.trace("start called");
return txTimeout;
}
@@ -159,7 +160,7 @@
}
public Xid[] recover(int i) throws XAException {
- if (log.isTraceEnabled()) log.trace("recover called: " + i);
+ if (trace) log.trace("recover called: " + i);
return null; //todo validate with javadoc
}
More information about the infinispan-commits
mailing list