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

[Manik Surtani]

  User: msurtani
  Date: 07/01/29 13:08:00

  Modified:    src/org/jboss/cache/interceptors 
                        DataGravitatorInterceptor.java
  Log:
  wc
  
  Revision  Changes    Path
  1.38      +25 -25    JBossCache/src/org/jboss/cache/interceptors/DataGravitatorInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DataGravitatorInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/DataGravitatorInterceptor.java,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -b -r1.37 -r1.38
  --- DataGravitatorInterceptor.java	17 Jan 2007 16:24:06 -0000	1.37
  +++ DataGravitatorInterceptor.java	29 Jan 2007 18:08:00 -0000	1.38
  @@ -245,28 +245,28 @@
            }
   
            List nodes = null;
  -         if (configuration.isUseRegionBasedMarshalling())
  -         {
  -            ClassLoader cl = Thread.currentThread().getContextClassLoader();
  -            try
  -            {
  -               cache.getRegionManager().setContextClassLoaderAsCurrent(name);
  -
  -               byte[] nodeData = (byte[]) resp[0];
  -               ByteArrayInputStream bais = new ByteArrayInputStream(nodeData);
  -               MarshalledValueInputStream mais = new MarshalledValueInputStream(bais);
  -               nodes = (List) mais.readObject();
  -               mais.close();
  -            }
  -            finally
  -            {
  -               Thread.currentThread().setContextClassLoader(cl);
  -            }
  -         }
  -         else
  -         {
  +//         if (configuration.isUseRegionBasedMarshalling())
  +//         {
  +//            ClassLoader cl = Thread.currentThread().getContextClassLoader();
  +//            try
  +//            {
  +//               cache.getRegionManager().setContextClassLoaderAsCurrent(name);
  +//
  +//               byte[] nodeData = (byte[]) resp[0];
  +//               ByteArrayInputStream bais = new ByteArrayInputStream(nodeData);
  +//               MarshalledValueInputStream mais = new MarshalledValueInputStream(bais);
  +//               nodes = (List) mais.readObject();
  +//               mais.close();
  +//            }
  +//            finally
  +//            {
  +//               Thread.currentThread().setContextClassLoader(cl);
  +//            }
  +//         }
  +//         else
  +//         {
               nodes = (List) resp[0];
  -         }
  +//         }
   
            Fqn bkup = (Fqn) resp[1];
            result = new BackupData(name, bkup, nodes);
  @@ -352,12 +352,12 @@
               else if (o != null)
               {
                  // keep looping till we find a FOUND answer.
  -               List dGravResp = (List) o;
  +               GravitateResult dGravResp = (GravitateResult) o;
                  // found?
  -               if ((Boolean) dGravResp.get(0))
  +               if (dGravResp.isDataFound())
                  {
  -                  result = dGravResp.get(1);
  -                  backupFqn = dGravResp.get(2);
  +                  result = dGravResp.getNodeData();
  +                  backupFqn = dGravResp.getBuddyBackupFqn();
                     break;
                  }
               }