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

Manik Surtani msurtani at jboss.com
Wed Jan 17 12:21:37 EST 2007


  User: msurtani
  Date: 07/01/17 12:21:37

  Modified:    src/org/jboss/cache/statetransfer  StateTransferManager.java
  Log:
  Removed unused Marshaller methods
  
  Revision  Changes    Path
  1.25      +2 -5      JBossCache/src/org/jboss/cache/statetransfer/StateTransferManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: StateTransferManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/statetransfer/StateTransferManager.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -b -r1.24 -r1.25
  --- StateTransferManager.java	17 Jan 2007 14:13:06 -0000	1.24
  +++ StateTransferManager.java	17 Jan 2007 17:21:37 -0000	1.25
  @@ -17,7 +17,6 @@
   import org.jboss.cache.loader.CacheLoaderManager;
   import org.jboss.cache.lock.NodeLock;
   import org.jboss.cache.lock.TimeoutException;
  -import org.jboss.cache.marshall.Marshaller;
   import org.jboss.cache.marshall.NodeData;
   import org.jboss.cache.marshall.NodeDataMarker;
   
  @@ -66,10 +65,8 @@
       */
      public void getState(ObjectOutputStream out, Fqn fqn, long timeout, boolean force, boolean suppressErrors) throws Throwable
      {
  -      Marshaller marshaller = cache.getMarshaller();
  -
         // can't give state for regions currently being activated/inactivated
  -      boolean canProvideState = (!marshaller.isInactive(fqn.toString()) && cache.findNode(fqn) != null);
  +      boolean canProvideState = (!cache.getRegionManager().isInactive(fqn.toString()) && cache.findNode(fqn) != null);
   
         boolean fetchTransientState = cache.getConfiguration().isFetchInMemoryState();
         CacheLoaderManager cacheLoaderManager = cache.getCacheLoaderManager();
  @@ -103,7 +100,7 @@
            {
               String exceptionMessage = "Cache instance at " + cache.getLocalAddress() + " cannot provide state for fqn " + fqn + ".";
   
  -            if (marshaller.isInactive(fqn.toString()))
  +            if (cache.getRegionManager().isInactive(fqn.toString()))
               {
                  exceptionMessage += " Region for fqn " + fqn + " is inactive.";
               }
  
  
  



More information about the jboss-cvs-commits mailing list