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

[Galder Zamarreno]

  User: gzamarreno
  Date: 07/01/30 14:22:07

  Modified:    src/org/jboss/cache/loader  FileCacheLoader.java
  Log:
  [JBCACHE-954] FileCacheLoader uses VAM as well. Architecture section in documentation updated to inform that JDBCCacheLoader and FileCacheLoader using VAM too.
  
  Revision  Changes    Path
  1.29      +14 -9     JBossCache/src/org/jboss/cache/loader/FileCacheLoader.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FileCacheLoader.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/loader/FileCacheLoader.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -b -r1.28 -r1.29
  --- FileCacheLoader.java	30 Dec 2006 17:50:01 -0000	1.28
  +++ FileCacheLoader.java	30 Jan 2007 19:22:07 -0000	1.29
  @@ -4,6 +4,7 @@
   import org.apache.commons.logging.LogFactory;
   import org.jboss.cache.Fqn;
   import org.jboss.cache.Modification;
  +import org.jboss.cache.marshall.ObjectSerializationFactory;
   import org.jboss.cache.config.CacheLoaderConfig.IndividualCacheLoaderConfig;
   import org.jboss.util.stream.MarshalledValueInputStream;
   
  @@ -12,6 +13,7 @@
   import java.io.FileOutputStream;
   import java.io.IOException;
   import java.io.ObjectOutputStream;
  +import java.io.ObjectInputStream;
   import java.util.HashMap;
   import java.util.HashSet;
   import java.util.List;
  @@ -25,7 +27,8 @@
    * Simple file-based CacheLoader implementation. Nodes are directories, attributes of a node is a file in the directory
    *
    * @author Bela Ban
  - * @version $Id: FileCacheLoader.java,v 1.28 2006/12/30 17:50:01 msurtani Exp $
  + * @author <a href="mailto:galder.zamarreno at jboss.com">Galder Zamarreno</a>
  + * @version $Id: FileCacheLoader.java,v 1.29 2007/01/30 19:22:07 gzamarreno Exp $
    */
   public class FileCacheLoader extends AbstractCacheLoader
   {
  @@ -357,10 +360,11 @@
         File child = new File(f, DATA);
         if (!child.exists()) return new HashMap(0); // no node attribs exist hence the empty HashMap.
         //if(!child.exists()) return null;
  -      FileInputStream in = new FileInputStream(child);
  -      MarshalledValueInputStream input = new MarshalledValueInputStream(in);
  -      Map m = (Map) input.readObject();
  -      in.close();
  +
  +      FileInputStream fileIn = new FileInputStream(child);
  +      ObjectInputStream input = ObjectSerializationFactory.createObjectInputStream(fileIn);
  +      Map m = (Map) getMarshaller().objectFromObjectStream(input);
  +      fileIn.close();
         return m;
      }
   
  @@ -383,10 +387,11 @@
               throw new IOException("Unable to create file: " + child);
            }
         }
  -      FileOutputStream out = new FileOutputStream(child);
  -      ObjectOutputStream output = new ObjectOutputStream(out);
  -      output.writeObject(attrs);
  -      out.close();
  +
  +      FileOutputStream fileOut = new FileOutputStream(child);
  +      ObjectOutputStream output = ObjectSerializationFactory.createObjectOutputStream(fileOut);
  +      getMarshaller().objectToObjectStream(attrs, output);
  +      fileOut.close();
      }
   
      protected boolean isCharacterPortableLocation(String fileAbsolutePath)