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

[Brian Stansberry]

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

  Modified:    src/org/jboss/cache/loader/bdbje  Tag:
                        Branch_JBossCache_1_4_0 BdbjeCacheLoader.java
  Log:
  [JBCACHE-769] Make a defensive copy of any map passed to put(Fqn, Map)
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.11.2.1  +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.11
  retrieving revision 1.11.2.1
  diff -u -b -r1.11 -r1.11.2.1
  --- BdbjeCacheLoader.java	6 May 2006 10:01:54 -0000	1.11
  +++ BdbjeCacheLoader.java	18 Sep 2006 21:39:48 -0000	1.11.2.1
  @@ -33,7 +33,7 @@
    *
    * @author Mark Hayes May 16, 2004
    * @author Bela Ban
  - * @version $Id: BdbjeCacheLoader.java,v 1.11 2006/05/06 10:01:54 msurtani Exp $
  + * @version $Id: BdbjeCacheLoader.java,v 1.11.2.1 2006/09/18 21:39:48 bstansberry Exp $
    */
   public class BdbjeCacheLoader implements CacheLoader {
   
  @@ -436,6 +436,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);
  @@ -466,6 +469,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);