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

[Manik Surtani]

  User: msurtani
  Date: 06/07/19 17:34:44

  Modified:    src/org/jboss/cache/loader   CacheLoaderManager.java
                        RmiDelegatingCacheLoader.java
  Log:
  JBCACHE-657
  JBCACHE-594
  
  Revision  Changes    Path
  1.21      +1 -1      JBossCache/src/org/jboss/cache/loader/CacheLoaderManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheLoaderManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/loader/CacheLoaderManager.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -b -r1.20 -r1.21
  --- CacheLoaderManager.java	19 Jul 2006 08:29:18 -0000	1.20
  +++ CacheLoaderManager.java	19 Jul 2006 21:34:44 -0000	1.21
  @@ -186,7 +186,7 @@
               // startCacheLoader() method.
   //           tmpLoader.create();
   //           tmpLoader.start();
  -            if (cache != null && cache.getUseMarshalling())
  +            if (cache != null && cache.getConfiguration().isUseRegionBasedMarshalling())
               {
                   tmpLoader.setRegionManager(cache.getRegionManager());
               }
  
  
  
  1.9       +2 -2      JBossCache/src/org/jboss/cache/loader/RmiDelegatingCacheLoader.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RmiDelegatingCacheLoader.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/loader/RmiDelegatingCacheLoader.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- RmiDelegatingCacheLoader.java	19 Jul 2006 08:29:18 -0000	1.8
  +++ RmiDelegatingCacheLoader.java	19 Jul 2006 21:34:44 -0000	1.9
  @@ -33,7 +33,7 @@
    * cacheloader's cache's cluster name.
    * 
    * @author Daniel Gredler
  - * @version $Id: RmiDelegatingCacheLoader.java,v 1.8 2006/07/19 08:29:18 msurtani Exp $
  + * @version $Id: RmiDelegatingCacheLoader.java,v 1.9 2006/07/19 21:34:44 msurtani Exp $
    */
   public class RmiDelegatingCacheLoader extends DelegatingCacheLoader {
   
  @@ -197,7 +197,7 @@
            return;
         }
         if(this.bindName == null) {
  -         this.bindName = this.cache.getClusterName();
  +         this.bindName = this.cache.getConfiguration().getClusterName();
         }
         if(!this.programmaticInit && this.cache.isCoordinator()) {
            // CacheLoader specified via XML, but this cache is the coordinator!