cvs commit: jahia/core/src/java/org/jahia/services/webdav/stores JahiaBindingStore.java

[Thomas Draier]

tdraier     2005/10/21 11:31:14 CEST

  Modified files:
    core/src/java/org/jahia/services/webdav/stores 
                                                   JahiaBindingStore.java 
  Log:
  fixed cache again
  
  Revision  Changes    Path
  1.6       +7 -7      
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.5&r2=1.6&f=h
  
  
  
  Index: JahiaBindingStore.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/webdav/stores/JahiaBindingStore.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- JahiaBindingStore.java    20 Oct 2005 13:03:42 -0000      1.5
  +++ JahiaBindingStore.java    21 Oct 2005 09:31:14 -0000      1.6
  @@ -21,7 +21,7 @@
    * Date: 4 oct. 2005 - 14:58:07
    *
    * @author toto
  - * @version $Id: JahiaBindingStore.java,v 1.5 2005/10/20 13:03:42 tdraier 
Exp $
  + * @version $Id: JahiaBindingStore.java,v 1.6 2005/10/21 09:31:14 tdraier 
Exp $
    */
   public class JahiaBindingStore extends BindingStore {
       public ObjectNode retrieveObject(Uri uri) throws ServiceAccessException, 
ObjectNotFoundException {
  @@ -151,10 +151,10 @@
                       }
   
                       public Object remove(Object key) {
  -                        if (Jahia.getThreadParamBean() == null) {
  +                        if (namespace == null) {
                               return null;
                           }
  -                        key = Jahia.getThreadParamBean().getSiteID() + "." + 
key;
  +                        key = namespace.getName() + "." + key;
                           Object r = jahiaCache.get(key);
                           jahiaCache.remove(key);
                           return r;
  @@ -164,10 +164,10 @@
                       }
   
                       public Object put(Object key, Object value) {
  -                        if (Jahia.getThreadParamBean() == null) {
  +                        if (namespace == null) {
                               return null;
                           }
  -                        key = Jahia.getThreadParamBean().getSiteID() + "." + 
key;
  +                        key = namespace.getName() + "." + key;
                           Object r = jahiaCache.get(key);
                           jahiaCache.put(key, value);
                           return r;
  @@ -182,10 +182,10 @@
                       }
   
                       public Object get(Object key) {
  -                        if (Jahia.getThreadParamBean() == null) {
  +                        if (namespace == null) {
                               return null;
                           }
  -                        key = Jahia.getThreadParamBean().getSiteID() + "." + 
key;
  +                        key = namespace.getName() + "." + key;
                           return jahiaCache.get(key);
                       }