cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject svn commit: r598490 - in /cocoon/branches/BRANCH_2_1_X: src/blocks/eventcache/java/org/apache/cocoon/caching/impl/AbstractDoubleMapEventRegistry.java src/blocks/eventcache/java/org/apache/cocoon/caching/impl/EventRegistryDataWrapper.java status.xml
Date Tue, 27 Nov 2007 01:56:15 GMT
Author: joerg
Date: Mon Nov 26 17:56:14 2007
New Revision: 598490

URL: http://svn.apache.org/viewvc?rev=598490&view=rev
Log:
COCOON-2146: Restore serializability of persistent cache when using event-aware cache by reverting
to actually deprecated MultiHashMap. The replacement MultiValueMap is not serializable (as
mentioned in COLLECTIONS-240).

Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/AbstractDoubleMapEventRegistry.java
    cocoon/branches/BRANCH_2_1_X/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/EventRegistryDataWrapper.java
    cocoon/branches/BRANCH_2_1_X/status.xml

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/AbstractDoubleMapEventRegistry.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/AbstractDoubleMapEventRegistry.java?rev=598490&r1=598489&r2=598490&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/AbstractDoubleMapEventRegistry.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/AbstractDoubleMapEventRegistry.java
Mon Nov 26 17:56:14 2007
@@ -27,7 +27,7 @@
 import org.apache.avalon.framework.thread.ThreadSafe;
 import org.apache.cocoon.caching.EventRegistry;
 import org.apache.cocoon.caching.validity.Event;
-import org.apache.commons.collections.map.MultiValueMap;
+import org.apache.commons.collections.MultiHashMap;
 
 /**
  * This abstract base implementation of <code>EventRegistry</code> stores 
@@ -50,8 +50,8 @@
     implements Initializable, EventRegistry, Disposable, ThreadSafe {
 
     private boolean m_init_success = false;
-    private MultiValueMap m_keyMMap;
-    private MultiValueMap m_eventMMap;
+    private MultiHashMap m_keyMMap;
+    private MultiHashMap m_eventMMap;
     
     /**
      * Registers (stores) a two-way mapping between this Event and this 
@@ -175,8 +175,8 @@
     }
 
     protected final void createBlankCache() {
-        this.m_eventMMap = new MultiValueMap(); 
-        this.m_keyMMap = new MultiValueMap(); 
+        this.m_eventMMap = new MultiHashMap(); 
+        this.m_keyMMap = new MultiHashMap(); 
     }
     
     /** 

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/EventRegistryDataWrapper.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/EventRegistryDataWrapper.java?rev=598490&r1=598489&r2=598490&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/EventRegistryDataWrapper.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/EventRegistryDataWrapper.java
Mon Nov 26 17:56:14 2007
@@ -18,7 +18,7 @@
 
 import java.io.Serializable;
 
-import org.apache.commons.collections.map.MultiValueMap;
+import org.apache.commons.collections.MultiHashMap;
 
 /**
  * A light object for persisting the state of an EventRegistry implementation 
@@ -28,22 +28,24 @@
  * @version CVS $Id$
  */
 public class EventRegistryDataWrapper implements Serializable {
-    private MultiValueMap m_keyMMap;
-    private MultiValueMap m_eventMMap;
     
+    private MultiHashMap m_keyMMap;
+    private MultiHashMap m_eventMMap;
+
     public EventRegistryDataWrapper() {
     }
 
-    public void setupMaps(MultiValueMap keyMap, MultiValueMap eventMap) {
+    public void setupMaps(MultiHashMap keyMap, MultiHashMap eventMap) {
         this.m_keyMMap = keyMap;
         this.m_eventMMap = eventMap;
     }
 
-    public MultiValueMap get_eventMap() {
+    public MultiHashMap get_eventMap() {
         return m_eventMMap;
     }
 
-    public MultiValueMap get_keyMap() {
+    public MultiHashMap get_keyMap() {
         return m_keyMMap;
     }
+
 }

Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/status.xml?rev=598490&r1=598489&r2=598490&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Mon Nov 26 17:56:14 2007
@@ -182,6 +182,9 @@
 
   <changes>
   <release version="2.1.11" date="TBD">
+    <action dev="JH" type="fix" fixes-bug="COCOON-2146" due-to="Ellis Pritchard" due-to-email="ellis@nukinetics.com">
+      Event Cache Block: Restore serializability of persistent cache when using event-aware
cache.
+    </action>
     <action dev="VG" type="fix" fixes-bug="COCOON-2129" due-to="Robin Wyles" due-to-email="rob@robinwyles.com">
       Mail Block: Fix setting of URL message body.
     </action>



Mime
View raw message