[jboss-cvs] JBossCache/src/org/jboss/cache/interceptors ...

[Manik Surtani]

  User: msurtani
  Date: 07/03/12 14:13:46

  Modified:    src/org/jboss/cache/interceptors    
                        OptimisticInterceptor.java Interceptor.java
                        ActivationInterceptor.java
                        OptimisticLockingInterceptor.java
  Log:
  JBCACHE-1005
  
  Revision  Changes    Path
  1.11      +1 -1      JBossCache/src/org/jboss/cache/interceptors/OptimisticInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: OptimisticInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/OptimisticInterceptor.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- OptimisticInterceptor.java	7 Feb 2007 22:06:41 -0000	1.10
  +++ OptimisticInterceptor.java	12 Mar 2007 18:13:46 -0000	1.11
  @@ -54,7 +54,7 @@
       * @param list
       * @param n
       */
  -   protected void greedyGetFqns(List<Fqn> list, NodeSPI n, Fqn newBase)
  +   protected void greedyGetFqns(List<Fqn> list, NodeSPI<?, ?> n, Fqn newBase)
      {
         list.add(n.getFqn());
         Fqn newFqn = new Fqn(newBase, n.getFqn().getLastElement());
  
  
  
  1.27      +7 -7      JBossCache/src/org/jboss/cache/interceptors/Interceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Interceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/Interceptor.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -b -r1.26 -r1.27
  --- Interceptor.java	30 Dec 2006 19:48:46 -0000	1.26
  +++ Interceptor.java	12 Mar 2007 18:13:46 -0000	1.27
  @@ -39,12 +39,12 @@
    * <em>Note that this will be replaced by {@link org.jboss.aop.advice.Interceptor} in one of the next releases</em>
    *
    * @author Bela Ban
  - * @version $Id: Interceptor.java,v 1.26 2006/12/30 19:48:46 msurtani Exp $
  + * @version $Id: Interceptor.java,v 1.27 2007/03/12 18:13:46 msurtani Exp $
    */
   public abstract class Interceptor implements InterceptorMBean
   {
      protected Interceptor next = null, last = null;
  -   protected CacheSPI cache;
  +   protected CacheSPI<?, ?> cache;
      protected Log log = null;
      protected Configuration configuration;
      private boolean statsEnabled = false;
  
  
  
  1.52      +2 -2      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.51
  retrieving revision 1.52
  diff -u -b -r1.51 -r1.52
  --- ActivationInterceptor.java	27 Feb 2007 17:27:44 -0000	1.51
  +++ ActivationInterceptor.java	12 Mar 2007 18:13:46 -0000	1.52
  @@ -25,7 +25,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.51 2007/02/27 17:27:44 msurtani Exp $
  + * @version $Id: ActivationInterceptor.java,v 1.52 2007/03/12 18:13:46 msurtani Exp $
    */
   public class ActivationInterceptor extends CacheLoaderInterceptor implements ActivationInterceptorMBean
   {
  @@ -194,7 +194,7 @@
      /**
       * Returns true if a node has all children loaded and initialized.
       */
  -   private boolean allInitialized(NodeSPI n)
  +   private boolean allInitialized(NodeSPI<?, ?> n)
      {
         if (!n.getChildrenLoaded())
         {
  
  
  
  1.28      +1 -1      JBossCache/src/org/jboss/cache/interceptors/OptimisticLockingInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: OptimisticLockingInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/OptimisticLockingInterceptor.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -b -r1.27 -r1.28
  --- OptimisticLockingInterceptor.java	7 Mar 2007 18:01:04 -0000	1.27
  +++ OptimisticLockingInterceptor.java	12 Mar 2007 18:13:46 -0000	1.28
  @@ -127,7 +127,7 @@
   
      private Object lockNodes(GlobalTransaction gtx) throws Exception
      {
  -      TransactionWorkspace workspace = getTransactionWorkspace(gtx);
  +      TransactionWorkspace<?, ?> workspace = getTransactionWorkspace(gtx);
         log.debug("Locking nodes in transaction workspace, presumably for a prepare()");
   
         // should be an ordered list