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

[Vladmir Blagojevic]

  User: vblagojevic
  Date: 06/09/06 11:34:13

  Modified:    src/org/jboss/cache/statetransfer  
                        AbstractStateTransferIntegrator.java
                        StateTransferManager.java
  Log:
  error handling for integration of persistent state
  
  Revision  Changes    Path
  1.2       +25 -10    JBossCache/src/org/jboss/cache/statetransfer/AbstractStateTransferIntegrator.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AbstractStateTransferIntegrator.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/statetransfer/AbstractStateTransferIntegrator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- AbstractStateTransferIntegrator.java	31 Aug 2006 20:30:45 -0000	1.1
  +++ AbstractStateTransferIntegrator.java	6 Sep 2006 15:34:13 -0000	1.2
  @@ -97,6 +97,7 @@
      {
   
         CacheLoader loader = cache.getCacheLoader();
  +      boolean persistentSet=false;
         if (loader == null)
         {
            log.error("cache loader is null, cannot set persistent state");
  @@ -105,6 +106,8 @@
         {
            if (log.isTraceEnabled())
               log.trace("setting the persistent state using " + loader.getClass());
  +         try
  +         {
            if (targetFqn.isRoot())
            {            
               loader.storeEntireState(in);           
  @@ -113,10 +116,22 @@
            {          
               loader.storeState(targetFqn, in);            
            }
  +            persistentSet=true;
  +         }
  +         finally
  +         {
  +            if(!persistentSet)
  +            {
  +               loader.remove(targetFqn);              
  +            }
  +            else
  +            {
            if (log.isTraceEnabled())
               log.trace("setting persistent state was successful");
         }
      }        
  +      }
  +   }        
      
      /**
       * Generates NodeAdded notifications for all nodes of the tree. This is
  
  
  
  1.9       +4 -2      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.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- StateTransferManager.java	31 Aug 2006 20:30:45 -0000	1.8
  +++ StateTransferManager.java	6 Sep 2006 15:34:13 -0000	1.9
  @@ -359,11 +359,13 @@
            
            try
            {
  +            log.info("starting state integration at node " +targetRoot + " using " + integrator);
               integrator.integrateState(targetRoot, cl);            
  +            log.info("successfully integrated state");
            }
            catch (Throwable t)
            {
  -            log.error("failed setting state", t);
  +            log.error("failed integrating state", t);
            }        
         }
         finally