tdraier 2005/10/20 15:02:54 CEST
Modified files:
core/src/java/org/apache/slide/common JahiaDomain.java
core/src/java/org/jahia/services/webdav/stores
JahiaBindingStore.java
Log:
fixed slide cache
Revision Changes Path
1.11 +5 -4
jahia/core/src/java/org/apache/slide/common/JahiaDomain.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/apache/slide/common/JahiaDomain.java.diff?r1=1.10&r2=1.11&f=h
1.4 +22 -23
jahia/core/src/java/org/jahia/services/webdav/stores/JahiaBindingStore.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/webdav/stores/JahiaBindingStore.java.diff?r1=1.3&r2=1.4&f=h
Index: JahiaDomain.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/apache/slide/common/JahiaDomain.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JahiaDomain.java 30 Sep 2005 15:33:54 -0000 1.10
+++ JahiaDomain.java 20 Oct 2005 13:02:54 -0000 1.11
@@ -13,11 +13,11 @@
* Date: 30 ao�t 2004
* Time: 17:23:47
* <p/>
- * $Author: knguyen $
- * $Date: 2005/09/30 15:33:54 $
- * $Id: JahiaDomain.java,v 1.10 2005/09/30 15:33:54 knguyen Exp $
+ * $Author: tdraier $
+ * $Date: 2005/10/20 13:02:54 $
+ * $Id: JahiaDomain.java,v 1.11 2005/10/20 13:02:54 tdraier Exp $
* $RCSfile: JahiaDomain.java,v $
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
* $Source:
/home/cvs/repository/jahia/core/src/java/org/apache/slide/common/JahiaDomain.java,v
$
* $State: Exp $
*/
@@ -75,6 +75,7 @@
SlideToken slideToken = new SlideTokenImpl(new
CredentialsToken(""));
rootUri = namespace.getUri(slideToken, "/");
try {
+
((ExtendedStore)rootUri.getStore()).removeObjectFromCache("/");
rootUri.getStore().retrieveObject(rootUri);
} catch (ObjectNotFoundException e) {
namespace.loadBaseData(data);
Index: JahiaBindingStore.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/webdav/stores/JahiaBindingStore.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JahiaBindingStore.java 17 Oct 2005 09:45:19 -0000 1.3
+++ JahiaBindingStore.java 20 Oct 2005 13:02:54 -0000 1.4
@@ -12,6 +12,7 @@
import org.jahia.services.cache.Cache;
import org.jahia.services.cache.CacheFactory;
import org.jahia.exceptions.JahiaInitializationException;
+import org.jahia.bin.Jahia;
import java.util.*;
@@ -20,7 +21,7 @@
* Date: 4 oct. 2005 - 14:58:07
*
* @author toto
- * @version $Id: JahiaBindingStore.java,v 1.3 2005/10/17 09:45:19 tdraier
Exp $
+ * @version $Id: JahiaBindingStore.java,v 1.4 2005/10/20 13:02:54 tdraier
Exp $
*/
public class JahiaBindingStore extends BindingStore {
public ObjectNode retrieveObject(Uri uri) throws ServiceAccessException,
ObjectNotFoundException {
@@ -127,6 +128,14 @@
private class JahiaTxLRUObjectCache extends TxLRUObjectCache {
private Cache jahiaCache;
+ protected void prune(Map map, Object key, String delimiter) {
+ map.clear();
+ }
+
+ protected void deprune(Set set, Object key, String delimiter) {
+ return;
+ }
+
public JahiaTxLRUObjectCache(int globalCacheSize, String name,
Logger logger, boolean noGlobalCachingInsideTx) {
super(globalCacheSize, name, logger, noGlobalCachingInsideTx);
@@ -142,6 +151,10 @@
}
public Object remove(Object key) {
+ if (Jahia.getThreadParamBean() == null) {
+ return null;
+ }
+ key = Jahia.getThreadParamBean().getSiteID() + "." +
key;
Object r = jahiaCache.get(key);
jahiaCache.remove(key);
return r;
@@ -151,6 +164,10 @@
}
public Object put(Object key, Object value) {
+ if (Jahia.getThreadParamBean() == null) {
+ return null;
+ }
+ key = Jahia.getThreadParamBean().getSiteID() + "." +
key;
Object r = jahiaCache.get(key);
jahiaCache.put(key, value);
return r;
@@ -165,6 +182,10 @@
}
public Object get(Object key) {
+ if (Jahia.getThreadParamBean() == null) {
+ return null;
+ }
+ key = Jahia.getThreadParamBean().getSiteID() + "." +
key;
return jahiaCache.get(key);
}
@@ -183,28 +204,6 @@
public void clear() {
jahiaCache.flush();
}
-
- class Entry implements Map.Entry {
- private Object key;
- private Object value;
-
- public Entry(Object key, Object value) {
- this.key = key;
- this.value = value;
- }
-
- public Object getKey() {
- return key;
- }
-
- public Object getValue() {
- return value;
- }
-
- public Object setValue(Object value) {
- return null;
- }
- }
};
} catch (JahiaInitializationException e) {
e.printStackTrace();
