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

[Manik Surtani]

  User: msurtani
  Date: 07/06/08 12:08:21

  Modified:    src/org/jboss/cache/loader  ClusteredCacheLoader.java
  Log:
  JBCACHE-1095
  
  Revision  Changes    Path
  1.23      +7 -1      JBossCache/src/org/jboss/cache/loader/ClusteredCacheLoader.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ClusteredCacheLoader.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/loader/ClusteredCacheLoader.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -b -r1.22 -r1.23
  --- ClusteredCacheLoader.java	6 Jun 2007 15:33:11 -0000	1.22
  +++ ClusteredCacheLoader.java	8 Jun 2007 16:08:21 -0000	1.23
  @@ -93,7 +93,7 @@
                  if (log.isDebugEnabled())
                     log.debug("Found remote exception among responses - removing from responses list", (Exception) o);
               }
  -            else
  +            else if (o != null)
               {
                  // keep looping till we find a FOUND answer.
                  List<Boolean> clusteredGetResp = (List<Boolean>) o;
  @@ -104,6 +104,12 @@
                     break;
                  }
               }
  +            else if (!cache.getConfiguration().isUseRegionBasedMarshalling())
  +            {
  +               throw new IllegalStateException("Received unexpected null response to " + clusteredGet);
  +            }
  +            // else region was inactive on peer;
  +            // keep looping to see if anyone else responded
            }
   
            if (log.isTraceEnabled()) log.trace("got responses " + resps);