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

Brian Stansberry brian.stansberry at jboss.com
Mon Sep 18 17:39:27 EDT 2006


  User: bstansberry
  Date: 06/09/18 17:39:27

  Modified:    src/org/jboss/cache/loader/bdbje  BdbjeCacheLoader.java
  Log:
  [JBCACHE-769] Make a defensive copy of map passed to put(Fqn, Map)
  
  Revision  Changes    Path
  1.15      +7 -1      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.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- BdbjeCacheLoader.java	12 Sep 2006 20:16:55 -0000	1.14
  +++ BdbjeCacheLoader.java	18 Sep 2006 21:39:27 -0000	1.15
  @@ -49,7 +49,7 @@
    *
    * @author Mark Hayes May 16, 2004
    * @author Bela Ban
  - * @version $Id: BdbjeCacheLoader.java,v 1.14 2006/09/12 20:16:55 vblagojevic Exp $
  + * @version $Id: BdbjeCacheLoader.java,v 1.15 2006/09/18 21:39:27 bstansberry Exp $
    */
   public class BdbjeCacheLoader extends AbstractCacheLoader
   {
  @@ -454,6 +454,9 @@
       private void doPut(Transaction txn, Fqn name, Map values)
          throws Exception {
   
  +       // JBCACHE-769 -- make a defensive copy
  +       values = (values == null ? null : new HashMap(values));
  +
          /* To update-or-insert, try putNoOverwrite first, then a RMW cycle. */
          DatabaseEntry dataEntry = makeDataEntry(values);
          DatabaseEntry keyEntry = makeKeyEntry(name);
  @@ -484,6 +487,9 @@
      private void doPutErase(Transaction txn, Fqn name, Map values)
         throws Exception {
   
  +      // JBCACHE-769 -- make a defensive copy
  +      values = (values == null ? null : new HashMap(values));
  +
         DatabaseEntry dataEntry = makeDataEntry(values);
         DatabaseEntry keyEntry = makeKeyEntry(name);
         Cursor cursor = cacheDb.openCursor(txn, null);
  
  
  



More information about the jboss-cvs-commits mailing list