tdraier 2005/10/20 15:21:28 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/java/org/apache/slide/common JahiaDomain.java
src/java/org/jahia/services/webdav/stores
JahiaBindingStore.java
Log:
fixed cache
Revision Changes Path
1.1.2.3 +4 -3 jahia/src/java/org/apache/slide/common/JahiaDomain.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/apache/slide/common/JahiaDomain.java.diff?r1=1.1.2.2&r2=1.1.2.3&f=h
1.1.2.4 +23 -9
jahia/src/java/org/jahia/services/webdav/stores/JahiaBindingStore.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/webdav/stores/JahiaBindingStore.java.diff?r1=1.1.2.3&r2=1.1.2.4&f=h
Index: JahiaDomain.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/apache/slide/common/Attic/JahiaDomain.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- JahiaDomain.java 3 Oct 2005 15:19:10 -0000 1.1.2.2
+++ JahiaDomain.java 20 Oct 2005 13:21:28 -0000 1.1.2.3
@@ -18,10 +18,10 @@
* Time: 17:23:47
* <p/>
* $Author: tdraier $
- * $Date: 2005/10/03 15:19:10 $
- * $Id: JahiaDomain.java,v 1.1.2.2 2005/10/03 15:19:10 tdraier Exp $
+ * $Date: 2005/10/20 13:21:28 $
+ * $Id: JahiaDomain.java,v 1.1.2.3 2005/10/20 13:21:28 tdraier Exp $
* $RCSfile: JahiaDomain.java,v $
- * $Revision: 1.1.2.2 $
+ * $Revision: 1.1.2.3 $
* $Source:
/home/cvs/repository/jahia/src/java/org/apache/slide/common/Attic/JahiaDomain.java,v
$
* $State: Exp $
*/
@@ -79,6 +79,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/src/java/org/jahia/services/webdav/stores/Attic/JahiaBindingStore.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- JahiaBindingStore.java 14 Oct 2005 11:01:48 -0000 1.1.2.3
+++ JahiaBindingStore.java 20 Oct 2005 13:21:28 -0000 1.1.2.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.Map;
import java.util.Collection;
@@ -23,7 +24,7 @@
* Date: 4 oct. 2005 - 14:58:07
*
* @author toto
- * @version $Id: JahiaBindingStore.java,v 1.1.2.3 2005/10/14 11:01:48
tdraier Exp $
+ * @version $Id: JahiaBindingStore.java,v 1.1.2.4 2005/10/20 13:21:28
tdraier Exp $
*/
public class JahiaBindingStore extends BindingStore {
public ObjectNode retrieveObject(Uri uri) throws ServiceAccessException,
ObjectNotFoundException {
@@ -145,6 +146,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;
@@ -154,19 +159,17 @@
}
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;
}
public Set keySet() {
- Set r = new HashSet();
- Object[] keys = jahiaCache.keys();
- for (int i = 0; i < keys.length; i++) {
- Object key = keys[i];
- r.add(new Entry(key,jahiaCache.get(key)));
- }
- return r;
+ return null;
}
public boolean isEmpty() {
@@ -174,11 +177,22 @@
}
public Object get(Object key) {
+ if (Jahia.getThreadParamBean() == null) {
+ return null;
+ }
+ key = Jahia.getThreadParamBean().getSiteID() + "." +
key;
return jahiaCache.get(key);
}
public Set entrySet() {
- return null;
+ Set r = new HashSet();
+ Object[] keys = jahiaCache.keys();
+ for (int i = 0; i < keys.length; i++) {
+ String key = (String) keys[i];
+ String keyNoSite =
key.substring(key.indexOf(".")+1);
+ r.add(new Entry(keyNoSite,jahiaCache.get(key)));
+ }
+ return r;
}
public boolean containsValue(Object value) {
