You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jo...@apache.org on 2007/01/05 00:15:30 UTC

svn commit: r492809 - in /cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src: changes/changes.xml main/java/org/apache/cocoon/reading/ResourceReader.java

Author: joerg
Date: Thu Jan  4 15:15:30 2007
New Revision: 492809

URL: http://svn.apache.org/viewvc?view=rev&rev=492809
Log:
COCOON-1977: Fix threading issue with internal cache in ResourceReader.

Modified:
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/changes/changes.xml
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/reading/ResourceReader.java

Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/changes/changes.xml?view=diff&rev=492809&r1=492808&r2=492809
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/changes/changes.xml (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/changes/changes.xml Thu Jan  4 15:15:30 2007
@@ -24,8 +24,10 @@
     +-->
 <document>
   <body>
-    <release version="1.0.0-M1-SNAPSHOT" date="2007-00-00" description="unreleased">  
-      
+    <release version="1.0.0-M1-SNAPSHOT" date="2007-00-00" description="unreleased">
+      <action dev="joerg" type="fix" issue="COCOON-1977" due-to="Ellis Pritchard">
+        Fix threading issue with internal cache in ResourceReader.
+      </action>
     </release>
   </body>
 </document>

Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/reading/ResourceReader.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/reading/ResourceReader.java?view=diff&rev=492809&r1=492808&r2=492809
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/reading/ResourceReader.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/reading/ResourceReader.java Thu Jan  4 15:15:30 2007
@@ -44,6 +44,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serializable;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -100,7 +101,7 @@
     /**
      * The list of generated documents
      */
-    private static final Map documents = new HashMap();
+    private static final Map documents = Collections.synchronizedMap(new HashMap());
 
     protected long configuredExpires = CONFIGURED_EXPIRES_DEFAULT;
     protected boolean configuredQuickTest = CONFIGURED_QUICK_TEST_DEFAULT;