jakarta-jcs-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asm...@apache.org
Subject cvs commit: jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/disk AbstractDiskCache.java
Date Tue, 25 May 2004 05:27:43 GMT
asmuts      2004/05/24 22:27:43

  Modified:    src/java/org/apache/jcs/auxiliary/remote
                        ZombieRemoteCacheService.java
                        RemoteCacheListener.java RemoteCacheInfo.java
               src/java/org/apache/jcs/auxiliary/lateral
                        ZombieLateralCacheService.java
                        LateralElementDescriptor.java LateralCacheInfo.java
               src/scripts tester.bat
               src/java/org/apache/jcs/auxiliary/remote/server
                        RemoteCacheServerListener.java
                        RemoteCacheServerInfo.java RemoteCacheServer.java
               src/java/org/apache/jcs/auxiliary/lateral/socket/tcp
                        LateralTCPService.java LateralTCPSender.java
                        LateralTCPListener.java
               src/java/org/apache/jcs/auxiliary/lateral/javagroups
                        LateralJGService.java LateralJGSender.java
                        LateralCacheJGListener.java
               src/java/org/apache/jcs/auxiliary/remote/behavior
                        IRemoteCacheService.java
               src/java/org/apache/jcs/auxiliary/lateral/behavior
                        ILateralCacheService.java
               src/java/org/apache/jcs/auxiliary/disk/jisp/behavior
                        IJISPCacheService.java
               src/java/org/apache/jcs/auxiliary/disk/hsql/behavior
                        IHSQLCacheService.java
               src/java/org/apache/jcs/engine/behavior ICacheListener.java
                        ICacheEventQueue.java
               src/java/org/apache/jcs/engine CacheInfo.java
                        CacheEventQueue.java CacheAdaptor.java
               src/java/org/apache/jcs/auxiliary/disk
                        AbstractDiskCache.java
  Log:
  Travis Savo's patches:
  
  1.  Made listener id long, to prevent duplication after lots of reconnects.
  
  2.  Fixed potential looping bug in remote cache removeAll
  
  Revision  Changes    Path
  1.4       +3 -3      jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/ZombieRemoteCacheService.java
  
  Index: ZombieRemoteCacheService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/ZombieRemoteCacheService.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ZombieRemoteCacheService.java	15 Apr 2004 19:22:47 -0000	1.3
  +++ ZombieRemoteCacheService.java	25 May 2004 05:27:42 -0000	1.4
  @@ -34,15 +34,15 @@
   {
   
       /** Description of the Method */
  -    public void update( ICacheElement item, byte listenerId ) { }
  +    public void update( ICacheElement item, long listenerId ) { }
   
   
       /** Description of the Method */
  -    public void remove( String cacheName, Serializable key, byte listenerId ) { }
  +    public void remove( String cacheName, Serializable key, long listenerId ) { }
   
   
       /** Description of the Method */
  -    public void removeAll( String cacheName, byte listenerId ) { }
  +    public void removeAll( String cacheName, long listenerId ) { }
   
       public Set getGroupKeys(String cacheName, String groupName)
       {
  
  
  
  1.10      +4 -4      jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheListener.java
  
  Index: RemoteCacheListener.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheListener.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- RemoteCacheListener.java	15 Apr 2004 19:22:47 -0000	1.9
  +++ RemoteCacheListener.java	25 May 2004 05:27:42 -0000	1.10
  @@ -112,7 +112,7 @@
        *
        * @param id The new listenerId value
        */
  -    public void setListenerId( byte id )
  +    public void setListenerId( long id )
           throws IOException
       {
           RemoteCacheInfo.listenerId = id;
  @@ -128,7 +128,7 @@
        *
        * @return The listenerId value
        */
  -    public byte getListenerId()
  +    public long getListenerId()
           throws IOException
       {
   
  @@ -256,8 +256,8 @@
               log.debug( "handleRemoveAll> cacheName=" + cacheName );
           }
           getCacheManager();
  -        ICache cache = cacheMgr.getCache( cacheName );
  -        cache.removeAll();
  +        CompositeCache cache = cacheMgr.getCache( cacheName );
  +        cache.localRemoveAll();
       }
   
   
  
  
  
  1.4       +1 -1      jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheInfo.java
  
  Index: RemoteCacheInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheInfo.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- RemoteCacheInfo.java	15 Apr 2004 19:22:47 -0000	1.3
  +++ RemoteCacheInfo.java	25 May 2004 05:27:42 -0000	1.4
  @@ -39,7 +39,7 @@
        * Need since there is no way to identify a client other than by host in
        * rmi.
        */
  -    protected static byte listenerId = 0;
  +    protected static long listenerId = 0;
   
   }
   
  
  
  
  1.5       +3 -3      jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/ZombieLateralCacheService.java
  
  Index: ZombieLateralCacheService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/ZombieLateralCacheService.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ZombieLateralCacheService.java	15 Apr 2004 19:22:48 -0000	1.4
  +++ ZombieLateralCacheService.java	25 May 2004 05:27:42 -0000	1.5
  @@ -36,15 +36,15 @@
   {
   
       /** Description of the Method */
  -    public void update( ICacheElement item, byte listenerId ) { }
  +    public void update( ICacheElement item, long listenerId ) { }
   
   
       /** Description of the Method */
  -    public void remove( String cacheName, Serializable key, byte listenerId ) { }
  +    public void remove( String cacheName, Serializable key, long listenerId ) { }
   
   
       /** Description of the Method */
  -    public void removeAll( String cacheName, byte listenerId ) { }
  +    public void removeAll( String cacheName, long listenerId ) { }
   
       public Set getGroupKeys(String cacheName, String groupName)
       {
  
  
  
  1.4       +1 -1      jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/LateralElementDescriptor.java
  
  Index: LateralElementDescriptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/LateralElementDescriptor.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LateralElementDescriptor.java	15 Apr 2004 19:22:48 -0000	1.3
  +++ LateralElementDescriptor.java	25 May 2004 05:27:42 -0000	1.4
  @@ -45,7 +45,7 @@
       /** Description of the Field */
       public ICacheElement ce;
       /** Description of the Field */
  -    public byte requesterId;
  +    public long requesterId;
   
       /** Description of the Field */
       public int command = UPDATE;
  
  
  
  1.4       +1 -1      jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheInfo.java
  
  Index: LateralCacheInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheInfo.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LateralCacheInfo.java	15 Apr 2004 19:22:48 -0000	1.3
  +++ LateralCacheInfo.java	25 May 2004 05:27:42 -0000	1.4
  @@ -40,6 +40,6 @@
        */
       protected static VMID vmid = new VMID();
       /** Description of the Field */
  -    public static byte listenerId = ( byte ) vmid.hashCode();
  +    public static long listenerId = vmid.hashCode();
   
   }
  
  
  
  1.2       +3 -1      jakarta-turbine-jcs/src/scripts/tester.bat
  
  Index: tester.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-jcs/src/scripts/tester.bat,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tester.bat	7 Apr 2002 16:55:28 -0000	1.1
  +++ tester.bat	25 May 2004 05:27:42 -0000	1.2
  @@ -1,9 +1,11 @@
   @echo off
   
   call prep.bat
  +
  +rem-Dlog4j.configuration=I:/dev/jakarta-turbine-jcs/src/scripts/log4j.properties
      
   :run
  -java -ms10m -mx400m org.apache.jcs.access.TestCacheAccess /cache%1.ccf  %2 %3 %4 %5
  +java -ms10m -mx400m  org.apache.jcs.access.TestCacheAccess /cache%1.ccf  %2 %3 %4 %5
    
   
   
  
  
  
  1.10      +2 -2      jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerListener.java
  
  Index: RemoteCacheServerListener.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerListener.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- RemoteCacheServerListener.java	15 Apr 2004 19:22:51 -0000	1.9
  +++ RemoteCacheServerListener.java	25 May 2004 05:27:42 -0000	1.10
  @@ -110,7 +110,7 @@
        *
        * @param id The new listenerId value
        */
  -    public void setListenerId( byte id )
  +    public void setListenerId( long id )
           throws IOException
       {
           RemoteCacheServerInfo.listenerId = id;
  @@ -126,7 +126,7 @@
        *
        * @return The listenerId value
        */
  -    public byte getListenerId()
  +    public long getListenerId()
           throws IOException
       {
   
  
  
  
  1.4       +1 -1      jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerInfo.java
  
  Index: RemoteCacheServerInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerInfo.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- RemoteCacheServerInfo.java	15 Apr 2004 19:22:51 -0000	1.3
  +++ RemoteCacheServerInfo.java	25 May 2004 05:27:42 -0000	1.4
  @@ -40,6 +40,6 @@
        */
       protected static VMID vmid = new VMID();
       /** Description of the Field */
  -    public static byte listenerId = ( byte ) vmid.hashCode();
  +    public static long listenerId = ( long ) vmid.hashCode();
   
   }
  
  
  
  1.15      +19 -19    jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServer.java
  
  Index: RemoteCacheServer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServer.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- RemoteCacheServer.java	15 Apr 2004 19:22:51 -0000	1.14
  +++ RemoteCacheServer.java	25 May 2004 05:27:42 -0000	1.15
  @@ -234,7 +234,7 @@
   
   
       /** Description of the Method */
  -    public void update( ICacheElement item, byte requesterId )
  +    public void update( ICacheElement item, long requesterId )
           throws IOException
       {
   
  @@ -263,7 +263,7 @@
               CacheListeners cacheDesc = getCacheListeners( item.getCacheName() );
               Object val = item.getVal();
   
  -            Integer remoteTypeL = ( Integer ) idTypeMap.get( new Byte( requesterId ) );
  +            Integer remoteTypeL = ( Integer ) idTypeMap.get( new Long( requesterId ) );
               boolean fromCluster = false;
               if ( remoteTypeL.intValue() == IRemoteCacheAttributes.CLUSTER )
               {
  @@ -353,7 +353,7 @@
        *
        * @return The eventQList value
        */
  -    private ICacheEventQueue[] getEventQList( CacheListeners cacheListeners, byte requesterId
)
  +    private ICacheEventQueue[] getEventQList( CacheListeners cacheListeners, long requesterId
)
       {
           ICacheEventQueue[] list = null;
           synchronized ( cacheListeners.eventQMap )
  @@ -405,7 +405,7 @@
               log.debug( "get " + key + " from cache " + cacheName );
           }
   
  -//        Integer remoteTypeL = ( Integer ) idTypeMap.get( new Byte( requesterId ) );
  +//        Integer remoteTypeL = ( Integer ) idTypeMap.get( new Long( requesterId ) );
           boolean fromCluster = false;
   //        if ( remoteTypeL.intValue() == IRemoteCacheAttributes.CLUSTER )
   //        {
  @@ -469,7 +469,7 @@
   
   
       /** Description of the Method */
  -    public void remove( String cacheName, Serializable key, byte requesterId )
  +    public void remove( String cacheName, Serializable key, long requesterId )
           throws IOException
       {
           if ( log.isDebugEnabled() )
  @@ -478,7 +478,7 @@
           }
           CacheListeners cacheDesc = ( CacheListeners ) cacheListenersMap.get( cacheName
);
   
  -        Integer remoteTypeL = ( Integer ) idTypeMap.get( new Byte( requesterId ) );
  +        Integer remoteTypeL = ( Integer ) idTypeMap.get( new Long( requesterId ) );
           boolean fromCluster = false;
           if ( remoteTypeL.intValue() == IRemoteCacheAttributes.CLUSTER )
           {
  @@ -541,12 +541,12 @@
       public void removeAll( String cacheName )
           throws IOException
       {
  -        removeAll( cacheName, ( byte ) 0 );
  +        removeAll( cacheName, ( long ) 0 );
       }
   
   
       /** Description of the Method */
  -    public void removeAll( String cacheName, byte requesterId )
  +    public void removeAll( String cacheName, long requesterId )
           throws IOException
       {
           CacheListeners cacheDesc = ( CacheListeners ) cacheListenersMap.get( cacheName
);
  @@ -573,12 +573,12 @@
       public void dispose( String cacheName )
           throws IOException
       {
  -        dispose( cacheName, ( byte ) 0 );
  +        dispose( cacheName, ( long ) 0 );
       }
   
   
       /** Description of the Method */
  -    public void dispose( String cacheName, byte requesterId )
  +    public void dispose( String cacheName, long requesterId )
           throws IOException
       {
           CacheListeners cacheDesc = ( CacheListeners ) cacheListenersMap.get( cacheName
);
  @@ -610,7 +610,7 @@
               for ( Enumeration en = cacheListenersMap.elements(); en.hasMoreElements();
 )
               {
                   CacheListeners cacheDesc = ( CacheListeners ) en.nextElement();
  -                ICacheEventQueue[] qlist = getEventQList( cacheDesc, ( byte ) 0 );
  +                ICacheEventQueue[] qlist = getEventQList( cacheDesc, ( long ) 0 );
   
                   for ( int i = 0; i < qlist.length; i++ )
                   {
  @@ -700,14 +700,14 @@
   
               synchronized ( ICacheListener.class )
               {
  -                byte id = 0;
  +                long id = 0;
                   try
                   {
                       id = listener.getListenerId();
                       if ( id == 0 )
                       {
                           // must start at one so the next gets recognized
  -                        byte listenerIdB = nextListenerId();
  +                        long listenerIdB = nextListenerId();
                           if ( log.isDebugEnabled() )
                           {
                               log.debug( "listener id=" + ( listenerIdB & 0xff ) + "
addded for cache " + cacheName );
  @@ -718,7 +718,7 @@
                           p1( "added new vm listener " + listenerIdB );
   
                           // relate the type to an id
  -                        this.idTypeMap.put( new Byte( listenerIdB ), new Integer( remoteType
) );
  +                        this.idTypeMap.put( new Long( listenerIdB ), new Integer( remoteType
) );
   
                       }
                       else
  @@ -847,17 +847,17 @@
       }
   
       /** Returns the next generated listener id [0,255]. */
  -    private byte nextListenerId()
  +    private long nextListenerId()
       {
  -        int id = 0;
  -        if ( listenerId[0] == 255 )
  +        long id = 0;
  +        if ( listenerId[0] == Long.MAX_VALUE )
           {
               synchronized ( listenerId )
               {
                   id = listenerId[0];
                   listenerId[0] = 0;
                   // TODO: record & check if the generated id is currently being
  -                // used by a valid listener.  Currently if the id wraps after 255,
  +                // used by a valid listener.  Currently if the id wraps after Long.MAX_VALUE,
                   // we just assume it won't collide with an existing listener who is live.
               }
           }
  @@ -868,7 +868,7 @@
                   id = ++listenerId[0];
               }
           }
  -        return ( byte ) ( id & 0xff );
  +        return id; //( long ) ( id & 0xff );
       }
   
       /**
  
  
  
  1.7       +6 -6      jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPService.java
  
  Index: LateralTCPService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPService.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- LateralTCPService.java	15 Apr 2004 19:22:56 -0000	1.6
  +++ LateralTCPService.java	25 May 2004 05:27:42 -0000	1.7
  @@ -94,7 +94,7 @@
       }
   
       /** */
  -    public void update( ICacheElement item, byte requesterId )
  +    public void update( ICacheElement item, long requesterId )
           throws IOException
       {
           LateralElementDescriptor led = new LateralElementDescriptor( item );
  @@ -111,7 +111,7 @@
       }
   
       /** */
  -    public void remove( String cacheName, Serializable key, byte requesterId )
  +    public void remove( String cacheName, Serializable key, long requesterId )
           throws IOException
       {
           CacheElement ce = new CacheElement( cacheName, key, null );
  @@ -164,10 +164,10 @@
        */
       public Set getGroupKeys(String cacheName, String group)
       {
  -        if (true) 
  +        if (true)
           {
               throw new UnsupportedOperationException("Groups not implemented.");
  -        }        
  +        }
           return null;
       }
   
  @@ -179,7 +179,7 @@
       }
   
       /** */
  -    public void removeAll( String cacheName, byte requesterId )
  +    public void removeAll( String cacheName, long requesterId )
           throws IOException
       {
           CacheElement ce = new CacheElement( cacheName, "ALL", null );
  
  
  
  1.10      +4 -4      jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPSender.java
  
  Index: LateralTCPSender.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPSender.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- LateralTCPSender.java	27 Apr 2004 21:08:24 -0000	1.9
  +++ LateralTCPSender.java	25 May 2004 05:27:42 -0000	1.10
  @@ -312,7 +312,7 @@
   
       // Service Methods //
       /** Description of the Method */
  -    public void update( ICacheElement item, byte requesterId )
  +    public void update( ICacheElement item, long requesterId )
           throws IOException
       {
           LateralElementDescriptor led = new LateralElementDescriptor( item );
  @@ -331,7 +331,7 @@
   
   
       /** Description of the Method */
  -    public void remove( String cacheName, Serializable key, byte requesterId )
  +    public void remove( String cacheName, Serializable key, long requesterId )
           throws IOException
       {
           CacheElement ce = new CacheElement( cacheName, key, null );
  @@ -373,7 +373,7 @@
   
   
       /** Description of the Method */
  -    public void removeAll( String cacheName, byte requesterId )
  +    public void removeAll( String cacheName, long requesterId )
           throws IOException
       {
           CacheElement ce = new CacheElement( cacheName, "ALL", null );
  
  
  
  1.7       +3 -3      jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java
  
  Index: LateralTCPListener.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- LateralTCPListener.java	15 Apr 2004 19:22:56 -0000	1.6
  +++ LateralTCPListener.java	25 May 2004 05:27:42 -0000	1.7
  @@ -138,7 +138,7 @@
        *
        * @param id The new listenerId value
        */
  -    public void setListenerId( byte id )
  +    public void setListenerId( long id )
           throws IOException
       {
           LateralCacheInfo.listenerId = id;
  @@ -153,7 +153,7 @@
        *
        * @return The listenerId value
        */
  -    public byte getListenerId()
  +    public long getListenerId()
           throws IOException
       {
           return LateralCacheInfo.listenerId;
  
  
  
  1.6       +3 -3      jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGService.java
  
  Index: LateralJGService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGService.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- LateralJGService.java	14 May 2004 05:00:13 -0000	1.5
  +++ LateralJGService.java	25 May 2004 05:27:42 -0000	1.6
  @@ -101,7 +101,7 @@
        * @param requesterId
        * @exception IOException
        */
  -    public void update( ICacheElement item, byte requesterId )
  +    public void update( ICacheElement item, long requesterId )
           throws IOException
       {
           LateralElementDescriptor led = new LateralElementDescriptor( item );
  @@ -127,7 +127,7 @@
        * @param requesterId
        * @exception IOException
        */
  -    public void remove( String cacheName, Serializable key, byte requesterId )
  +    public void remove( String cacheName, Serializable key, long requesterId )
           throws IOException
       {
           CacheElement ce = new CacheElement( cacheName, key, null );
  @@ -192,7 +192,7 @@
        * @param requesterId
        * @exception IOException
        */
  -    public void removeAll( String cacheName, byte requesterId )
  +    public void removeAll( String cacheName, long requesterId )
           throws IOException
       {
           CacheElement ce = new CacheElement( cacheName, "ALL", null );
  
  
  
  1.6       +4 -4      jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGSender.java
  
  Index: LateralJGSender.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralJGSender.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- LateralJGSender.java	14 May 2004 05:00:13 -0000	1.5
  +++ LateralJGSender.java	25 May 2004 05:27:42 -0000	1.6
  @@ -243,7 +243,7 @@
        * @param requesterId
        * @exception IOException
        */
  -    public void update( ICacheElement item, byte requesterId )
  +    public void update( ICacheElement item, long requesterId )
           throws IOException
       {
           LateralElementDescriptor led = new LateralElementDescriptor( item );
  @@ -275,7 +275,7 @@
        * @param requesterId
        * @exception IOException
        */
  -    public void remove( String cacheName, Serializable key, byte requesterId )
  +    public void remove( String cacheName, Serializable key, long requesterId )
           throws IOException
       {
           CacheElement ce = new CacheElement( cacheName, key, null );
  @@ -334,7 +334,7 @@
        * @param requesterId
        * @exception IOException
        */
  -    public void removeAll( String cacheName, byte requesterId )
  +    public void removeAll( String cacheName, long requesterId )
           throws IOException
       {
           CacheElement ce = new CacheElement( cacheName, "ALL", null );
  
  
  
  1.8       +2 -2      jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralCacheJGListener.java
  
  Index: LateralCacheJGListener.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralCacheJGListener.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- LateralCacheJGListener.java	14 May 2004 05:00:13 -0000	1.7
  +++ LateralCacheJGListener.java	25 May 2004 05:27:42 -0000	1.8
  @@ -107,7 +107,7 @@
        * @param id The new listenerId value
        * @exception IOException
        */
  -    public void setListenerId( byte id )
  +    public void setListenerId( long id )
           throws IOException
       {
           LateralCacheInfo.listenerId = id;
  @@ -124,7 +124,7 @@
        * @return The listenerId value
        * @exception IOException
        */
  -    public byte getListenerId()
  +    public long getListenerId()
           throws IOException
       {
   
  
  
  
  1.9       +3 -3      jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/behavior/IRemoteCacheService.java
  
  Index: IRemoteCacheService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/behavior/IRemoteCacheService.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- IRemoteCacheService.java	15 Apr 2004 19:22:56 -0000	1.8
  +++ IRemoteCacheService.java	25 May 2004 05:27:42 -0000	1.9
  @@ -37,17 +37,17 @@
   {
   
       /** Puts a cache item to the cache. */
  -    public void update( ICacheElement item, byte requesterId )
  +    public void update( ICacheElement item, long requesterId )
           throws ObjectExistsException, IOException;
   
   
       /** Removes the given key from the specified cache. */
  -    public void remove( String cacheName, Serializable key, byte requesterId )
  +    public void remove( String cacheName, Serializable key, long requesterId )
           throws IOException;
   
   
       /** Remove all keys from the sepcified cache. */
  -    public void removeAll( String cacheName, byte requesterId )
  +    public void removeAll( String cacheName, long requesterId )
           throws IOException;
   
       public Set getGroupKeys(String cacheName, String groupName)
  
  
  
  1.5       +3 -3      jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/behavior/ILateralCacheService.java
  
  Index: ILateralCacheService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/behavior/ILateralCacheService.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ILateralCacheService.java	15 Apr 2004 19:22:58 -0000	1.4
  +++ ILateralCacheService.java	25 May 2004 05:27:42 -0000	1.5
  @@ -33,17 +33,17 @@
   {
   
       /** Puts a cache item to the cache. */
  -    public void update( ICacheElement item, byte requesterId )
  +    public void update( ICacheElement item, long requesterId )
           throws IOException;
   
   
       /** Removes the given key from the specified cache. */
  -    public void remove( String cacheName, Serializable key, byte requesterId )
  +    public void remove( String cacheName, Serializable key, long requesterId )
           throws IOException;
   
   
       /** Remove all keys from the sepcified cache. */
  -    public void removeAll( String cacheName, byte requesterId )
  +    public void removeAll( String cacheName, long requesterId )
           throws IOException;
   
       public Set getGroupKeys(String cacheName, String groupName);
  
  
  
  1.4       +3 -3      jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/disk/jisp/behavior/IJISPCacheService.java
  
  Index: IJISPCacheService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/disk/jisp/behavior/IJISPCacheService.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- IJISPCacheService.java	15 Apr 2004 19:22:58 -0000	1.3
  +++ IJISPCacheService.java	25 May 2004 05:27:43 -0000	1.4
  @@ -32,17 +32,17 @@
   {
   
       /** Puts a cache item to the cache. */
  -    public void update( ICacheElement item, byte requesterId )
  +    public void update( ICacheElement item, long requesterId )
           throws IOException;
   
   
       /** Removes the given key from the specified cache. */
  -    public void remove( String cacheName, Serializable key, byte requesterId )
  +    public void remove( String cacheName, Serializable key, long requesterId )
           throws IOException;
   
   
       /** Remove all keys from the sepcified cache. */
  -    public void removeAll( String cacheName, byte requesterId )
  +    public void removeAll( String cacheName, long requesterId )
           throws IOException;
   
   }
  
  
  
  1.4       +3 -3      jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/disk/hsql/behavior/IHSQLCacheService.java
  
  Index: IHSQLCacheService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/disk/hsql/behavior/IHSQLCacheService.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- IHSQLCacheService.java	15 Apr 2004 19:22:58 -0000	1.3
  +++ IHSQLCacheService.java	25 May 2004 05:27:43 -0000	1.4
  @@ -32,17 +32,17 @@
   {
   
       /** Puts a cache item to the cache. */
  -    public void update( ICacheElement item, byte requesterId )
  +    public void update( ICacheElement item, long requesterId )
           throws IOException;
   
   
       /** Removes the given key from the specified cache. */
  -    public void remove( String cacheName, Serializable key, byte requesterId )
  +    public void remove( String cacheName, Serializable key, long requesterId )
           throws IOException;
   
   
       /** Remove all keys from the sepcified cache. */
  -    public void removeAll( String cacheName, byte requesterId )
  +    public void removeAll( String cacheName, long requesterId )
           throws IOException;
   
   }
  
  
  
  1.4       +2 -2      jakarta-turbine-jcs/src/java/org/apache/jcs/engine/behavior/ICacheListener.java
  
  Index: ICacheListener.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/engine/behavior/ICacheListener.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ICacheListener.java	15 Apr 2004 19:22:53 -0000	1.3
  +++ ICacheListener.java	25 May 2004 05:27:43 -0000	1.4
  @@ -63,7 +63,7 @@
        *
        * @param id The new listenerId value
        */
  -    public void setListenerId( byte id )
  +    public void setListenerId( long id )
           throws IOException;
   
   
  @@ -72,7 +72,7 @@
        *
        * @return The listenerId value
        */
  -    public byte getListenerId()
  +    public long getListenerId()
           throws IOException;
   
   }
  
  
  
  1.4       +1 -1      jakarta-turbine-jcs/src/java/org/apache/jcs/engine/behavior/ICacheEventQueue.java
  
  Index: ICacheEventQueue.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/engine/behavior/ICacheEventQueue.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ICacheEventQueue.java	15 Apr 2004 19:22:53 -0000	1.3
  +++ ICacheEventQueue.java	25 May 2004 05:27:43 -0000	1.4
  @@ -69,7 +69,7 @@
        *
        * @return The listenerId value
        */
  -    public byte getListenerId();
  +    public long getListenerId();
   
   
       /** Description of the Method */
  
  
  
  1.4       +1 -1      jakarta-turbine-jcs/src/java/org/apache/jcs/engine/CacheInfo.java
  
  Index: CacheInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/engine/CacheInfo.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CacheInfo.java	15 Apr 2004 19:22:49 -0000	1.3
  +++ CacheInfo.java	25 May 2004 05:27:43 -0000	1.4
  @@ -41,6 +41,6 @@
        */
       protected static VMID vmid = new VMID();
       /** Description of the Field */
  -    public static byte listenerId = ( byte ) vmid.hashCode();
  +    public static long listenerId = ( long ) vmid.hashCode();
   
   }
  
  
  
  1.8       +4 -4      jakarta-turbine-jcs/src/java/org/apache/jcs/engine/CacheEventQueue.java
  
  Index: CacheEventQueue.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/engine/CacheEventQueue.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- CacheEventQueue.java	17 Apr 2004 14:00:11 -0000	1.7
  +++ CacheEventQueue.java	25 May 2004 05:27:43 -0000	1.8
  @@ -51,7 +51,7 @@
       // private LinkedQueue queue = new LinkedQueue();
   
       private ICacheListener listener;
  -    private byte listenerId;
  +    private long listenerId;
       private String cacheName;
   
       private int failureCount;
  @@ -80,7 +80,7 @@
        * @param cacheName
        */
       public CacheEventQueue( ICacheListener listener,
  -                            byte listenerId,
  +                            long listenerId,
                               String cacheName )
       {
           this( listener, listenerId, cacheName, 10, 500 );
  @@ -96,7 +96,7 @@
        * @param waitBeforeRetry
        */
       public CacheEventQueue( ICacheListener listener,
  -                            byte listenerId,
  +                            long listenerId,
                               String cacheName,
                               int maxFailure,
                               int waitBeforeRetry )
  @@ -163,7 +163,7 @@
       /**
        * @return The {3} value
        */
  -    public byte getListenerId()
  +    public long getListenerId()
       {
           return this.listenerId;
       }
  
  
  
  1.4       +3 -3      jakarta-turbine-jcs/src/java/org/apache/jcs/engine/CacheAdaptor.java
  
  Index: CacheAdaptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/engine/CacheAdaptor.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CacheAdaptor.java	15 Apr 2004 19:22:49 -0000	1.3
  +++ CacheAdaptor.java	25 May 2004 05:27:43 -0000	1.4
  @@ -39,7 +39,7 @@
       private final ICache cache;
   
       /** Description of the Field */
  -    protected byte listenerId = 0;
  +    protected long listenerId = 0;
   
   
       /**
  @@ -47,7 +47,7 @@
        *
        * @param id The new listenerId value
        */
  -    public void setListenerId( byte id )
  +    public void setListenerId( long id )
           throws IOException
       {
           this.listenerId = id;
  @@ -60,7 +60,7 @@
        *
        * @return The listenerId value
        */
  -    public byte getListenerId()
  +    public long getListenerId()
           throws IOException
       {
           return this.listenerId;
  
  
  
  1.21      +4 -4      jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/disk/AbstractDiskCache.java
  
  Index: AbstractDiskCache.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/disk/AbstractDiskCache.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- AbstractDiskCache.java	15 Apr 2004 19:22:52 -0000	1.20
  +++ AbstractDiskCache.java	25 May 2004 05:27:43 -0000	1.21
  @@ -354,12 +354,12 @@
        */
       private class MyCacheListener implements ICacheListener
       {
  -        private byte listenerId = 0;
  +        private long listenerId = 0;
   
           /**
            * @see ICacheListener#getListenerId
            */
  -        public byte getListenerId()
  +        public long getListenerId()
               throws IOException
           {
               return this.listenerId;
  @@ -368,7 +368,7 @@
           /**
            * @see ICacheListener#setListenerId
            */
  -        public void setListenerId( byte id )
  +        public void setListenerId( long id )
               throws IOException
           {
               this.listenerId = id;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-jcs-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-jcs-dev-help@jakarta.apache.org


Mime
View raw message