cziegeler 02/02/13 03:05:10
Modified: src/java/org/apache/cocoon Cocoon.java
src/java/org/apache/cocoon/components/store
FilesystemStore.java MRUMemoryStore.java
Log:
Removed fix
Revision Changes Path
1.15 +1 -3 xml-cocoon2/src/java/org/apache/cocoon/Cocoon.java
Index: Cocoon.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/Cocoon.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Cocoon.java 7 Feb 2002 23:28:34 -0000 1.14
+++ Cocoon.java 13 Feb 2002 11:05:10 -0000 1.15
@@ -80,8 +80,6 @@
import org.apache.cocoon.components.source.DelayedRefreshSourceWrapper;
import org.apache.cocoon.components.source.SourceHandler;
import org.apache.cocoon.components.source.URLSource;
-import org.apache.cocoon.components.store.FilesystemStore;
-import org.apache.cocoon.components.store.Store;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.ModifiableSource;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -105,7 +103,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Pierpaolo Fumagalli</a> (Apache
Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Leo Sutic</a>
- * @version CVS $Id: Cocoon.java,v 1.14 2002/02/07 23:28:34 dims Exp $
+ * @version CVS $Id: Cocoon.java,v 1.15 2002/02/13 11:05:10 cziegeler Exp $
*/
public class Cocoon
extends AbstractLoggable
1.11 +1 -7
xml-cocoon2/src/java/org/apache/cocoon/components/store/FilesystemStore.java
Index: FilesystemStore.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/store/FilesystemStore.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FilesystemStore.java 13 Feb 2002 08:56:50 -0000 1.10
+++ FilesystemStore.java 13 Feb 2002 11:05:10 -0000 1.11
@@ -77,17 +77,11 @@
*
* @author ?
* @author <a href="mailto:[EMAIL PROTECTED]";>Vadim Gritsenko</a>
- * @version CVS $Id: FilesystemStore.java,v 1.10 2002/02/13 08:56:50 cziegeler Exp $
+ * @version CVS $Id: FilesystemStore.java,v 1.11 2002/02/13 11:05:10 cziegeler Exp $
*/
public final class FilesystemStore
extends AbstractLoggable
implements Store, Contextualizable, Parameterizable, ThreadSafe {
-
- protected static final int BYTE_MASK = 0x0f;
- protected static final char[] HEX_DIGITS =
- {
- '0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'
- };
protected File workDir;
protected File cacheDir;
1.11 +1 -6
xml-cocoon2/src/java/org/apache/cocoon/components/store/MRUMemoryStore.java
Index: MRUMemoryStore.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/store/MRUMemoryStore.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MRUMemoryStore.java 4 Feb 2002 12:31:09 -0000 1.10
+++ MRUMemoryStore.java 13 Feb 2002 11:05:10 -0000 1.11
@@ -86,7 +86,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Gerhard Froehlich</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Vadim Gritsenko</a>
- * @version CVS $Id: MRUMemoryStore.java,v 1.10 2002/02/04 12:31:09 cziegeler Exp $
+ * @version CVS $Id: MRUMemoryStore.java,v 1.11 2002/02/13 11:05:10 cziegeler Exp $
*/
public final class MRUMemoryStore
extends AbstractLoggable
@@ -242,11 +242,6 @@
value = this.persistentStore.get(getFileName(key.toString()));
if (value != null) {
try {
- // FIXME (VG): This is hack for FilesystemStore which returns
file
- if (value instanceof File) {
- value = IOUtils.deserializeObject((File)value);
- }
-
if(!this.cache.containsKey(key)) {
this.hold(key, value);
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
