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/04 23:45:56 UTC
svn commit: r492792 - in /cocoon/branches/BRANCH_2_1_X:
src/java/org/apache/cocoon/reading/ResourceReader.java status.xml
Author: joerg
Date: Thu Jan 4 14:45:55 2007
New Revision: 492792
URL: http://svn.apache.org/viewvc?view=rev&rev=492792
Log:
COCOON-1977: Fix threading issue with internal cache in ResourceReader.
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/reading/ResourceReader.java
cocoon/branches/BRANCH_2_1_X/status.xml
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/reading/ResourceReader.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/reading/ResourceReader.java?view=diff&rev=492792&r1=492791&r2=492792
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/reading/ResourceReader.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/reading/ResourceReader.java Thu Jan 4 14:45:55 2007
@@ -41,6 +41,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;
@@ -92,7 +93,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;
protected boolean configuredQuickTest;
Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/status.xml?view=diff&rev=492792&r1=492791&r2=492792
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Thu Jan 4 14:45:55 2007
@@ -181,6 +181,9 @@
<changes>
<release version="2.1.11" date="TBD">
+ <action dev="JH" type="fix" fixes-bug="COCOON-1977" due-to="Ellis Pritchard">
+ Core: Fix threading issue with internal cache in ResourceReader.
+ </action>
<action dev="JH" type="fix" fixes-bug="COCOON-1976" due-to="Rob Berens">
POI Block: Prevent NPE in ElementProcessorSerializer on characters before first startElement.
</action>