[jboss-cvs] JBossCache/src/org/jboss/cache/interceptors ...
Brian Stansberry
brian.stansberry at jboss.com
Thu Nov 9 21:48:46 EST 2006
User: bstansberry
Date: 06/11/09 21:48:46
Modified: src/org/jboss/cache/interceptors
InvalidationInterceptor.java TxInterceptor.java
CacheLoaderInterceptor.java
ActivationInterceptor.java
CacheStoreInterceptor.java
PassivationInterceptor.java
Log:
Rename config property used to control CacheMgmtInterceptor
Revision Changes Path
1.28 +1 -1 JBossCache/src/org/jboss/cache/interceptors/InvalidationInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: InvalidationInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/InvalidationInterceptor.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- InvalidationInterceptor.java 25 Sep 2006 05:50:04 -0000 1.27
+++ InvalidationInterceptor.java 10 Nov 2006 02:48:46 -0000 1.28
@@ -149,7 +149,7 @@
protected void invalidateAcrossCluster(Fqn fqn, TransactionWorkspace workspace) throws Throwable
{
// increment invalidations counter if statistics maintained
- if (configuration.isUseMbean() && getStatisticsEnabled())
+ if (configuration.getExposeManagementStatistics() && getStatisticsEnabled())
m_invalidations++;
// only propagate version details if we're using explicit versioning.
1.63 +3 -3 JBossCache/src/org/jboss/cache/interceptors/TxInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TxInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/TxInterceptor.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- TxInterceptor.java 19 Oct 2006 13:29:57 -0000 1.62
+++ TxInterceptor.java 10 Nov 2006 02:48:46 -0000 1.63
@@ -95,7 +95,7 @@
{
result = handleRemotePrepare(m, ctx.getGlobalTransaction());
scrubTxsOnExit = true;
- if (configuration.isUseMbean() && getStatisticsEnabled())
+ if (configuration.getExposeManagementStatistics() && getStatisticsEnabled())
m_prepares++;
}
else
@@ -528,13 +528,13 @@
if (m.getMethodId() == MethodDeclarations.commitMethod_id)
{
txManager.commit();
- if (configuration.isUseMbean() && getStatisticsEnabled())
+ if (configuration.getExposeManagementStatistics() && getStatisticsEnabled())
m_commits++;
}
else
{
txManager.rollback();
- if (configuration.isUseMbean() && getStatisticsEnabled())
+ if (configuration.getExposeManagementStatistics() && getStatisticsEnabled())
m_rollbacks++;
}
}
1.58 +2 -2 JBossCache/src/org/jboss/cache/interceptors/CacheLoaderInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheLoaderInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/CacheLoaderInterceptor.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- CacheLoaderInterceptor.java 25 Sep 2006 05:50:04 -0000 1.57
+++ CacheLoaderInterceptor.java 10 Nov 2006 02:48:46 -0000 1.58
@@ -32,7 +32,7 @@
* Loads nodes that don't exist at the time of the call into memory from the CacheLoader
*
* @author Bela Ban
- * @version $Id: CacheLoaderInterceptor.java,v 1.57 2006/09/25 05:50:04 bwang Exp $
+ * @version $Id: CacheLoaderInterceptor.java,v 1.58 2006/11/10 02:48:46 bstansberry Exp $
*/
public class CacheLoaderInterceptor extends BaseCacheLoaderInterceptor implements CacheLoaderInterceptorMBean
{
@@ -546,7 +546,7 @@
boolean nodeExists = (nodeData != null);
if (log.isTraceEnabled()) log.trace("nodeExists " + nodeExists);
- if (configuration.isUseMbean() && getStatisticsEnabled())
+ if (configuration.getExposeManagementStatistics() && getStatisticsEnabled())
{
if (nodeExists)
{
1.39 +5 -5 JBossCache/src/org/jboss/cache/interceptors/ActivationInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ActivationInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/ActivationInterceptor.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- ActivationInterceptor.java 25 Sep 2006 05:50:04 -0000 1.38
+++ ActivationInterceptor.java 10 Nov 2006 02:48:46 -0000 1.39
@@ -27,7 +27,7 @@
* their attributes have been initialized and their children have been loaded in memory.
*
* @author <a href="mailto:{hmesha at novell.com}">{Hany Mesha}</a>
- * @version $Id: ActivationInterceptor.java,v 1.38 2006/09/25 05:50:04 bwang Exp $
+ * @version $Id: ActivationInterceptor.java,v 1.39 2006/11/10 02:48:46 bstansberry Exp $
*/
public class ActivationInterceptor extends CacheLoaderInterceptor implements ActivationInterceptorMBean
{
@@ -80,7 +80,7 @@
if (hasModifications(args))
{
loader.commit(gtx);
- if (configuration.isUseMbean() && getStatisticsEnabled())
+ if (configuration.getExposeManagementStatistics() && getStatisticsEnabled())
{
Integer acts = (Integer) m_txActivations.get(gtx);
if (acts != null)
@@ -95,7 +95,7 @@
if (hasModifications(args))
{
loader.rollback(gtx);
- if (configuration.isUseMbean() && getStatisticsEnabled())
+ if (configuration.getExposeManagementStatistics() && getStatisticsEnabled())
{
m_txActivations.remove(gtx);
}
@@ -187,7 +187,7 @@
{
cache.getNotifier().notifyNodeActivated(fqn, true);
loader.remove(fqn);
- if (configuration.isUseMbean() && getStatisticsEnabled())
+ if (configuration.getExposeManagementStatistics() && getStatisticsEnabled())
{
m_activations++;
}
@@ -328,7 +328,7 @@
if (cache_loader_modifications.size() > 0)
{
loader.prepare(gtx, cache_loader_modifications, false);
- if (configuration.isUseMbean() && getStatisticsEnabled() && txActs > 0)
+ if (configuration.getExposeManagementStatistics() && getStatisticsEnabled() && txActs > 0)
{
m_txActivations.put(gtx, new Integer(txActs));
}
1.36 +7 -7 JBossCache/src/org/jboss/cache/interceptors/CacheStoreInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheStoreInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/CacheStoreInterceptor.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- CacheStoreInterceptor.java 25 Sep 2006 05:50:04 -0000 1.35
+++ CacheStoreInterceptor.java 10 Nov 2006 02:48:46 -0000 1.36
@@ -26,7 +26,7 @@
* through the CacheLoader, either after each method call (no TXs), or at TX commit.
*
* @author Bela Ban
- * @version $Id: CacheStoreInterceptor.java,v 1.35 2006/09/25 05:50:04 bwang Exp $
+ * @version $Id: CacheStoreInterceptor.java,v 1.36 2006/11/10 02:48:46 bstansberry Exp $
*/
public class CacheStoreInterceptor extends BaseCacheLoaderInterceptor implements CacheStoreInterceptorMBean
{
@@ -102,7 +102,7 @@
releaseLoaderLocks(fqnsModified);
preparingTxs.remove(gtx);
}
- if (configuration.isUseMbean() && getStatisticsEnabled())
+ if (configuration.getExposeManagementStatistics() && getStatisticsEnabled())
{
Integer puts = (Integer) m_txStores.get(gtx);
if (puts != null)
@@ -126,7 +126,7 @@
preparingTxs.remove(gtx);
loader.rollback(gtx);
}
- if (configuration.isUseMbean() && getStatisticsEnabled())
+ if (configuration.getExposeManagementStatistics() && getStatisticsEnabled())
{
m_txStores.remove(gtx);
}
@@ -217,7 +217,7 @@
{
releaseLoaderLock(fqn);
}
- if (configuration.isUseMbean() && getStatisticsEnabled())
+ if (configuration.getExposeManagementStatistics() && getStatisticsEnabled())
{
m_cacheStores++;
}
@@ -236,7 +236,7 @@
{
releaseLoaderLock(fqn);
}
- if (configuration.isUseMbean() && getStatisticsEnabled())
+ if (configuration.getExposeManagementStatistics() && getStatisticsEnabled())
{
m_cacheStores++;
}
@@ -354,7 +354,7 @@
MethodCall methodCall = (MethodCall) it.next();
Modification mod = convertMethodCallToModification(methodCall);
cache_loader_modifications.add(mod);
- if (configuration.isUseMbean() && getStatisticsEnabled())
+ if (configuration.getExposeManagementStatistics() && getStatisticsEnabled())
{
if ((mod.getType() == Modification.ModificationType.PUT_DATA) ||
(mod.getType() == Modification.ModificationType.PUT_DATA_ERASE) ||
@@ -372,7 +372,7 @@
{
loader.prepare(gtx, cache_loader_modifications, onePhase);
preparingTxs.put(gtx, gtx);
- if (configuration.isUseMbean() && getStatisticsEnabled() && txPuts > 0)
+ if (configuration.getExposeManagementStatistics() && getStatisticsEnabled() && txPuts > 0)
{
m_txStores.put(gtx, new Integer(txPuts));
}
1.31 +2 -2 JBossCache/src/org/jboss/cache/interceptors/PassivationInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PassivationInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/PassivationInterceptor.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- PassivationInterceptor.java 30 Oct 2006 04:32:27 -0000 1.30
+++ PassivationInterceptor.java 10 Nov 2006 02:48:46 -0000 1.31
@@ -18,7 +18,7 @@
* CacheLoader, either before each method call (no TXs), or at TX commit.
*
* @author <a href="mailto:{hmesha at novell.com}">{Hany Mesha}</a>
- * @version $Id: PassivationInterceptor.java,v 1.30 2006/10/30 04:32:27 bstansberry Exp $
+ * @version $Id: PassivationInterceptor.java,v 1.31 2006/11/10 02:48:46 bstansberry Exp $
*/
public class PassivationInterceptor extends Interceptor implements PassivationInterceptorMBean
{
@@ -72,7 +72,7 @@
cache.getNotifier().notifyNodePassivated(fqn, false);
}
- if (getStatisticsEnabled() && configuration.isUseMbean())
+ if (getStatisticsEnabled() && configuration.getExposeManagementStatistics())
{
m_passivations.increment();
}
More information about the jboss-cvs-commits
mailing list