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

[Vladmir Blagojevic]

  User: vblagojevic
  Date: 06/09/13 11:42:17

  Modified:    src/org/jboss/cache/statetransfer  
                        DefaultStateTransferGenerator.java
                        DefaultStateTransferIntegrator.java
  Log:
  more robust error handling for loadstate/storestate
  
  Revision  Changes    Path
  1.2       +4 -3      JBossCache/src/org/jboss/cache/statetransfer/DefaultStateTransferGenerator.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DefaultStateTransferGenerator.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/statetransfer/DefaultStateTransferGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- DefaultStateTransferGenerator.java	12 Sep 2006 21:12:45 -0000	1.1
  +++ DefaultStateTransferGenerator.java	13 Sep 2006 15:42:17 -0000	1.2
  @@ -17,6 +17,7 @@
   import org.jboss.cache.Fqn;
   import org.jboss.cache.TreeCache;
   import org.jboss.cache.Version;
  +import org.jboss.cache.loader.NodeDataExceptionMarker;
   import org.jboss.cache.loader.NodeData;
   
   public class DefaultStateTransferGenerator implements StateTransferGenerator
  @@ -63,7 +64,7 @@
            {
               encouteredException=t;
               log.error("failed getting the in-memory (transient) state", t);
  -            out.writeObject(t);            
  +            out.writeObject(new NodeDataExceptionMarker(t));            
            }
            finally
            {            
  @@ -85,7 +86,7 @@
            {
               encouteredException=t;
               log.error("failed writing associated state", t);   
  -            out.writeObject(t);   
  +            out.writeObject(new NodeDataExceptionMarker(t));   
            }
            finally
            {            
  @@ -118,7 +119,7 @@
            {
               encouteredException=t;
               log.error("failed getting the persistent state", t);
  -            out.writeObject(t);            
  +            out.writeObject(new NodeDataExceptionMarker(t));            
            }
            finally
            {            
  
  
  
  1.2       +2 -3      JBossCache/src/org/jboss/cache/statetransfer/DefaultStateTransferIntegrator.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DefaultStateTransferIntegrator.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/statetransfer/DefaultStateTransferIntegrator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- DefaultStateTransferIntegrator.java	12 Sep 2006 21:12:45 -0000	1.1
  +++ DefaultStateTransferIntegrator.java	13 Sep 2006 15:42:17 -0000	1.2
  @@ -376,9 +376,8 @@
         catch (ClassCastException cce)
         {
            cause = cce;
  -         log.error("Failed integrating persistent state. There are two possible causes:\n " +  
  -                    "- state provider cacheloader generated exception during cacherloader.loadState() \n " + 
  -                    "- one of cacheloaders is not adhering to stream format[JBCACHE-738].\n Caused by " + cce.getLocalizedMessage());
  +         log.error("Failed integrating persistent state. One of cacheloaders is not"
  +               + " adhering to state stream format [JBCACHE-738].");
         }
         catch(Throwable t)
         {