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

[Vladmir Blagojevic]

  User: vblagojevic
  Date: 07/04/20 13:18:47

  Modified:    src/org/jboss/cache/statetransfer 
                        DefaultStateTransferIntegrator.java
  Log:
  check nodes for marker as they are read
  
  Revision  Changes    Path
  1.24      +7 -10     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.23
  retrieving revision 1.24
  diff -u -b -r1.23 -r1.24
  --- DefaultStateTransferIntegrator.java	12 Mar 2007 18:13:48 -0000	1.23
  +++ DefaultStateTransferIntegrator.java	20 Apr 2007 17:18:47 -0000	1.24
  @@ -276,15 +276,6 @@
         if (obj instanceof NodeDataMarker) return null;
   
         List list = (List) obj;
  -      for (Object o : list)
  -      {
  -         if (o instanceof NodeDataExceptionMarker)
  -         {
  -            NodeDataExceptionMarker ndem = (NodeDataExceptionMarker) o;
  -            throw new CacheException("State provider node " + ndem.getCacheNodeIdentity()
  -                                     + " threw exception during loadState", ndem.getCause());
  -         }
  -      }
         return list;
      }
   
  @@ -349,6 +340,12 @@
            // and return the next NodeData that's a child of our parent
            nd = integrateStateTransferChildren(target, offset, nodeDataIterator);
         }
  +      if (nd != null && nd.isExceptionMarker())
  +      {
  +	  NodeDataExceptionMarker ndem = (NodeDataExceptionMarker) nd;     
  +	  throw new CacheException("State provider node " + ndem.getCacheNodeIdentity()
  +	                           + " threw exception during loadState", ndem.getCause());
  +      }      
         return null;
      }