asmuts      02/05/15 12:38:32

  Modified:    src/conf cache.ccf
               src/java/org/apache/jcs/auxiliary/lateral
                        LateralCacheFactory.java
               src/java/org/apache/jcs/auxiliary/lateral/socket/tcp
                        LateralTCPSender.java
  Log:
  simple config to make sure that nothing else breaks when a lateral is configured
  
  Revision  Changes    Path
  1.2       +7 -5      jakarta-turbine-jcs/src/conf/cache.ccf
  
  Index: cache.ccf
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-jcs/src/conf/cache.ccf,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- cache.ccf 7 Apr 2002 16:55:20 -0000       1.1
  +++ cache.ccf 15 May 2002 19:38:32 -0000      1.2
  @@ -11,7 +11,7 @@
   jcs.default.cacheattributes.ShrinkerIntervalSeconds=60
   jcs.default.elementattributes=org.apache.jcs.engine.ElementAttributes
   jcs.default.elementattributes.IsEternal=false
  -jcs.default.elementattributes.MaxLifeSeconds=3600
  +jcs.default.elementattributes.MaxLifeSeconds=7
   jcs.default.elementattributes.IdleTime=1800
   jcs.default.elementattributes.IsSpool=true
   jcs.default.elementattributes.IsRemote=true
  @@ -37,18 +37,20 @@
   # Regions preconfirgured for caching
   jcs.region.testCache1=DC,RFailover
   jcs.region.testCache1.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
  -jcs.region.testCache1.cacheattributes.MaxObjects=1000
  +jcs.region.testCache1.cacheattributes.MaxObjects=10000
   
jcs.region.testCache1.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
   jcs.region.testCache1.cacheattributes.UseMemoryShrinker=true
   jcs.region.testCache1.cacheattributes.MaxMemoryIdleTimeSeconds=3600
  -jcs.region.testCache1.cacheattributes.ShrinkerIntervalSeconds=60
  +jcs.region.testCache1.cacheattributes.ShrinkerIntervalSeconds=3
  +jcs.region.testCache1.elementattributes.IsEternal=false
  +jcs.region.testCache1.elementattributes.MaxLifeSeconds=10
   
   jcs.region.testCache2=DC,LTCP
   jcs.region.testCache2.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
   jcs.region.testCache2.cacheattributes.MaxObjects=1000
   
jcs.region.testCache2.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
   jcs.region.testCache2.cacheattributes.UseMemoryShrinker=true
  -jcs.region.testCache2.cacheattributes.MaxMemoryIdleTimeSeconds=3600
  +jcs.region.testCache2.cacheattributes.MaxMemoryIdleTimeSeconds=10
   jcs.region.testCache2.cacheattributes.ShrinkerIntervalSeconds=60
   jcs.region.testCache2.elementattributes=org.apache.jcs.engine.ElementAttributes
   jcs.region.testCache2.elementattributes.IsEternal=false
  @@ -107,7 +109,7 @@
   # Primary Disk Cache-- faster than the rest because of memory key storage
   jcs.auxiliary.DC=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory
   
jcs.auxiliary.DC.attributes=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes
  -jcs.auxiliary.DC.attributes.DiskPath=@project_home_f@raf
  +jcs.auxiliary.DC.attributes.DiskPath=g:\dev\raf
   
   # HSQL Disk Cache -- too slow as is
   jcs.auxiliary.HDC=org.apache.jcs.auxiliary.disk.hsql.HSQLCacheFactory
  
  
  
  1.3       +4 -1      
jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheFactory.java
  
  Index: LateralCacheFactory.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LateralCacheFactory.java  10 Apr 2002 15:01:00 -0000      1.2
  +++ LateralCacheFactory.java  15 May 2002 19:38:32 -0000      1.3
  @@ -72,7 +72,10 @@
               {
                   //String server = (String)it.next();
                   String server = ( String ) it.nextElement();
  -                //p( "tcp server = " +  server );
  +                if ( log.isDebugEnabled() )
  +                {
  +                  log.debug( "tcp server = " +  server );
  +                }
                   lac.setTcpServer( server );
                   LateralCacheManager lcm = LateralCacheManager.getInstance( lac );
                   ICache ic = lcm.getCache( lac.getCacheName() );
  
  
  
  1.3       +15 -3     
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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LateralTCPSender.java     10 Apr 2002 15:01:00 -0000      1.2
  +++ LateralTCPSender.java     15 May 2002 19:38:32 -0000      1.3
  @@ -33,7 +33,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Aaron Smuts</a>
    * @created January 15, 2002
  - * @version $Id: LateralTCPSender.java,v 1.2 2002/04/10 15:01:00 jtaylor Exp $
  + * @version $Id: LateralTCPSender.java,v 1.3 2002/05/15 19:38:32 asmuts Exp $
    */
   public class LateralTCPSender
   {
  @@ -75,7 +75,17 @@
           String p1 = lca.getTcpServer();
           String h2 = p1.substring( 0, p1.indexOf( ":" ) );
           int po = Integer.parseInt( p1.substring( p1.indexOf( ":" ) + 1 ) );
  -        log.debug( "h2 = " + h2 );
  +        if ( log.isDebugEnabled() )
  +        {
  +          log.debug( "h2 = " + h2 );
  +          log.debug( "po = " + po );
  +        }
  +
  +        if ( h2 == null )
  +        {
  +          throw new IOException( "Cannot connect to invalid address " + h2 + ":" + 
po );
  +        }
  +
           init( h2, po );
           this.ilca = lca;
       }
  @@ -129,6 +139,7 @@
        * @return The addressByName value
        */
       private InetAddress getAddressByName( String host )
  +      throws IOException
       {
           try
           {
  @@ -137,7 +148,8 @@
           catch ( Exception e )
           {
               log.error( "Could not find address of [" + host + "]", e );
  -            return null;
  +            throw new IOException( "Could not find address of [" + host + "]" + 
e.getMessage() );
  +            //return null;
           }
       }
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to