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

[Vladmir Blagojevic]

  User: vblagojevic
  Date: 06/09/07 14:56:39

  Modified:    src/org/jboss/cache/statetransfer 
                        AbstractStateTransferIntegrator.java
  Log:
  improve error logging
  
  Revision  Changes    Path
  1.4       +18 -12    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.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- AbstractStateTransferIntegrator.java	7 Sep 2006 17:41:52 -0000	1.3
  +++ AbstractStateTransferIntegrator.java	7 Sep 2006 18:56:39 -0000	1.4
  @@ -345,7 +345,7 @@
        
      protected void integrateStateHelper(ObjectInputStream ois, DataNode target, ClassLoader cl) throws Exception
      {
  -      boolean exceptionsEncountered=false;
  +      Throwable cause=null;
         //first try integrating transient state
         try
         {
  @@ -353,8 +353,8 @@
         }
         catch(Throwable t)
         {
  -         exceptionsEncountered=true;
  -         log.error("Failed integrating transient state. Cause " + t.getLocalizedMessage());
  +         cause = t;
  +         log.error("Failed integrating transient state.",t);
         }
         
         //then try integrating associated state
  @@ -364,8 +364,8 @@
         }
         catch(Throwable t)
         {
  -         exceptionsEncountered=true;
  -         log.error("Failed integrating associated state. Cause " + t.getLocalizedMessage());
  +         cause = t;
  +         log.error("Failed integrating associated state.",t);
         }
         
         //finally try integrating persistent
  @@ -373,18 +373,24 @@
         {
            integratePersistentState(ois);
         }
  +      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());
  +      }
         catch(Throwable t)
         {        
  -         exceptionsEncountered=true; 
  -        log.error("Failed integrating persistent state. Cause " + t.getLocalizedMessage());
  +         cause = t;
  +         log.error("Failed integrating persistent state.", t);
         }
  -      
         finally
         {
            ois.close();
  -         if(exceptionsEncountered)
  +         if(cause!=null)
            {
  -            throw new Exception("State transfer was not successful");
  +            throw new Exception("State transfer failed ");
            }
         }
      }