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

[Elias Ross]

  User: genman  
  Date: 06/11/20 02:33:14

  Modified:    src/org/jboss/cache/loader/bdbje  BdbjeCacheLoader.java
  Log:
  JBCACHE-867 -- Fix some data copying issues of Node.getData()
  
  Revision  Changes    Path
  1.21      +4 -3      JBossCache/src/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BdbjeCacheLoader.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -b -r1.20 -r1.21
  --- BdbjeCacheLoader.java	20 Nov 2006 03:53:55 -0000	1.20
  +++ BdbjeCacheLoader.java	20 Nov 2006 07:33:14 -0000	1.21
  @@ -24,6 +24,7 @@
   import org.jboss.cache.Modification;
   import org.jboss.cache.config.CacheLoaderConfig.IndividualCacheLoaderConfig;
   import org.jboss.cache.loader.AbstractCacheLoader;
  +import org.jboss.cache.util.MapCopy;
   
   import java.io.File;
   import java.io.IOException;
  @@ -50,7 +51,7 @@
    *
    * @author Mark Hayes May 16, 2004
    * @author Bela Ban
  - * @version $Id: BdbjeCacheLoader.java,v 1.20 2006/11/20 03:53:55 genman Exp $
  + * @version $Id: BdbjeCacheLoader.java,v 1.21 2006/11/20 07:33:14 genman Exp $
    */
   public class BdbjeCacheLoader extends AbstractCacheLoader
   {
  @@ -531,7 +532,7 @@
      {
   
         // JBCACHE-769 -- make a defensive copy
  -      values = (values == null ? null : new HashMap(values));
  +      values = (values == null ? null : new MapCopy(values));
   
         /* To update-or-insert, try putNoOverwrite first, then a RMW cycle. */
         DatabaseEntry dataEntry = makeDataEntry(values);
  @@ -574,7 +575,7 @@
      {
   
         // JBCACHE-769 -- make a defensive copy
  -      values = (values == null ? null : new HashMap(values));
  +      values = (values == null ? null : new MapCopy(values));
   
         DatabaseEntry dataEntry = makeDataEntry(values);
         DatabaseEntry keyEntry = makeKeyEntry(name);