[jboss-cvs] JBossCache/src/org/jboss/cache/interceptors ...
Manik Surtani
msurtani at jboss.com
Fri Aug 25 07:59:02 EDT 2006
User: msurtani
Date: 06/08/25 07:59:02
Modified: src/org/jboss/cache/interceptors
CacheMgmtInterceptor.java
CreateIfNotExistsInterceptor.java
EvictionInterceptor.java
PessimisticLockInterceptor.java
ReplicationInterceptor.java
Log:
fixed
- eviction interceptor
- removed putFailFast()
- notifications with null data
Revision Changes Path
1.18 +1 -5 JBossCache/src/org/jboss/cache/interceptors/CacheMgmtInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheMgmtInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/CacheMgmtInterceptor.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- CacheMgmtInterceptor.java 19 Jul 2006 21:34:43 -0000 1.17
+++ CacheMgmtInterceptor.java 25 Aug 2006 11:59:02 -0000 1.18
@@ -44,7 +44,7 @@
/**
* Captures cache management statistics
* @author Jerry Gauthier
- * @version $Id: CacheMgmtInterceptor.java,v 1.17 2006/07/19 21:34:43 msurtani Exp $
+ * @version $Id: CacheMgmtInterceptor.java,v 1.18 2006/08/25 11:59:02 msurtani Exp $
*/
public class CacheMgmtInterceptor extends Interceptor implements CacheMgmtInterceptorMBean, NotificationBroadcaster
{
@@ -149,10 +149,6 @@
}
break;
case MethodDeclarations.putKeyValMethodLocal_id:
- case MethodDeclarations.putFailFastKeyValueMethodLocal_id:
- //fqn = (Fqn) args[1];
- //key = args[2];
- //value = args[3];
t1 = System.currentTimeMillis();
retval=super.invoke(m);
t2 = System.currentTimeMillis();
1.16 +1 -2 JBossCache/src/org/jboss/cache/interceptors/CreateIfNotExistsInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CreateIfNotExistsInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/CreateIfNotExistsInterceptor.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- CreateIfNotExistsInterceptor.java 18 Aug 2006 15:40:39 -0000 1.15
+++ CreateIfNotExistsInterceptor.java 25 Aug 2006 11:59:02 -0000 1.16
@@ -16,7 +16,7 @@
* Handles putXXX() methods: if the given node doesn't exist, it will be created
* (depending on the create_if_not_exists argument)
* @author Bela Ban
- * @version $Id: CreateIfNotExistsInterceptor.java,v 1.15 2006/08/18 15:40:39 msurtani Exp $
+ * @version $Id: CreateIfNotExistsInterceptor.java,v 1.16 2006/08/25 11:59:02 msurtani Exp $
* @deprecated This code is not used anymore and will be removed in a future release
*/
public class CreateIfNotExistsInterceptor extends Interceptor {
@@ -37,7 +37,6 @@
putMethods.add(MethodDeclarations.putDataEraseMethodLocal);
putMethods.add(MethodDeclarations.putDataMethodLocal);
putMethods.add(MethodDeclarations.putKeyValMethodLocal);
- putMethods.add(MethodDeclarations.putFailFastKeyValueMethodLocal);
}
1.5 +1 -3 JBossCache/src/org/jboss/cache/interceptors/EvictionInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EvictionInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/EvictionInterceptor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- EvictionInterceptor.java 19 Jul 2006 21:34:43 -0000 1.4
+++ EvictionInterceptor.java 25 Aug 2006 11:59:02 -0000 1.5
@@ -26,7 +26,7 @@
* This interceptor is used to handle eviction events.
*
* @author Daniel Huang
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class EvictionInterceptor extends Interceptor
{
@@ -59,8 +59,6 @@
handler = new PutKeyEvictionMethodHandler();
evictionMethodHandlers.put(MethodDeclarations.putKeyValMethodLocal, handler);
- evictionMethodHandlers.put(MethodDeclarations.putFailFastKeyValueMethodLocal, handler);
-
}
/**
1.27 +1 -2 JBossCache/src/org/jboss/cache/interceptors/PessimisticLockInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PessimisticLockInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/PessimisticLockInterceptor.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- PessimisticLockInterceptor.java 22 Aug 2006 11:38:54 -0000 1.26
+++ PessimisticLockInterceptor.java 25 Aug 2006 11:59:02 -0000 1.27
@@ -37,7 +37,7 @@
* current method and unlock when the method returns.
*
* @author Bela Ban
- * @version $Id: PessimisticLockInterceptor.java,v 1.26 2006/08/22 11:38:54 msurtani Exp $
+ * @version $Id: PessimisticLockInterceptor.java,v 1.27 2006/08/25 11:59:02 msurtani Exp $
*/
public class PessimisticLockInterceptor extends Interceptor {
TransactionTable tx_table=null;
@@ -73,7 +73,6 @@
case MethodDeclarations.putDataMethodLocal_id:
case MethodDeclarations.putDataEraseMethodLocal_id:
case MethodDeclarations.putKeyValMethodLocal_id:
- case MethodDeclarations.putFailFastKeyValueMethodLocal_id:
log.trace("Creating nodes if necessary");
createNodes((Fqn) args[1], ctx.getGlobalTransaction());
break;
1.36 +1 -9 JBossCache/src/org/jboss/cache/interceptors/ReplicationInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ReplicationInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/ReplicationInterceptor.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- ReplicationInterceptor.java 18 Aug 2006 15:40:39 -0000 1.35
+++ ReplicationInterceptor.java 25 Aug 2006 11:59:02 -0000 1.36
@@ -16,7 +16,7 @@
* 'side-ways' (see docs/design/Refactoring.txt).
*
* @author Bela Ban
- * @version $Id: ReplicationInterceptor.java,v 1.35 2006/08/18 15:40:39 msurtani Exp $
+ * @version $Id: ReplicationInterceptor.java,v 1.36 2006/08/25 11:59:02 msurtani Exp $
*/
public class ReplicationInterceptor extends BaseRpcInterceptor
{
@@ -93,14 +93,6 @@
void handleReplicatedMethod(JBCMethodCall m, Configuration.CacheMode mode) throws Throwable
{
- if (mode == Configuration.CacheMode.REPL_SYNC && (m.getMethodId() == MethodDeclarations.putFailFastKeyValueMethodLocal_id))
- {
- if (log.isTraceEnabled())
- {
- log.trace("forcing asynchronous replication for putFailFast()");
- }
- mode = Configuration.CacheMode.REPL_ASYNC;
- }
if (log.isTraceEnabled())
{
log.trace("invoking method " + m + ", members=" + cache.getMembers() + ", mode=" +
More information about the jboss-cvs-commits
mailing list