tdraier 2005/09/28 13:06:51 CEST
Modified files:
core/src/java/org/jahia/services/containers
JahiaContainersBaseService.java
core/src/java/org/jahia/services/importexport
ContentPickerListener.java
core/src/java/org/jahia/services/workflow WorkflowService.java
Log:
cache problem with delete
Revision Changes Path
1.26 +1 -0
jahia/core/src/java/org/jahia/services/containers/JahiaContainersBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/containers/JahiaContainersBaseService.java.diff?r1=1.25&r2=1.26&f=h
1.11 +11 -10
jahia/core/src/java/org/jahia/services/importexport/ContentPickerListener.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/importexport/ContentPickerListener.java.diff?r1=1.10&r2=1.11&f=h
1.27 +0 -0
jahia/core/src/java/org/jahia/services/workflow/WorkflowService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/workflow/WorkflowService.java.diff?r1=1.26&r2=1.27&f=h
Index: JahiaContainersBaseService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/containers/JahiaContainersBaseService.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- JahiaContainersBaseService.java 27 Sep 2005 10:58:41 -0000 1.25
+++ JahiaContainersBaseService.java 28 Sep 2005 11:06:50 -0000 1.26
@@ -2427,6 +2427,7 @@
//
containerInfoCache.remove(this.getCacheContainerOrContainerListActiveEntryKey(containerParam.intValue()));
//
containerInfoCache.remove(this.getCacheContainerOrContainerListStagingEntryKey(containerParam.intValue()));
ContentContainer.invalidateContainerCache(contentContainer.getID());
+ contentContainer =
ContentContainer.getContainer(contentContainer.getID());
//
c_utils.invalidateCtnIdsByCtnListCache(contentContainer.getParentContainerListID());
} else {
// we have to create a staged entry to be able to active mark
for deleted on this container's fields
Index: ContentPickerListener.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/importexport/ContentPickerListener.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ContentPickerListener.java 27 Sep 2005 16:36:52 -0000 1.10
+++ ContentPickerListener.java 28 Sep 2005 11:06:51 -0000 1.11
@@ -117,7 +117,7 @@
ie.ensureFile(sourceFile, jParams, destSite);
}
- if (source instanceof ContentContainer &&
((ContentContainer)source).isDeletedOrDoesNotExist(0)) {
+ if ((source instanceof ContentContainer &&
((ContentContainer)source).isDeletedOrDoesNotExist(Integer.MAX_VALUE)) ||
source.isMarkedForDelete()) {
Set curLanguageCodes = new HashSet();
curLanguageCodes.add(ContentObject.SHARED_LANGUAGE);
@@ -147,18 +147,19 @@
if (!parentPicks.isEmpty()) {
for (Iterator iterator = parentPicks.iterator();
iterator.hasNext();) {
ContentObject picker = (ContentObject)
iterator.next();
+ if (picker != null) {
+ JahiaSite destSite =
ServicesRegistry.getInstance().getJahiaSitesService().getSite(picker.getSiteID());
- JahiaSite destSite =
ServicesRegistry.getInstance().getJahiaSitesService().getSite(picker.getSiteID());
+ if (source instanceof ContentFileField) {
+ JahiaSite sourceSite =
ServicesRegistry.getInstance().getJahiaSitesService().getSite(source.getSiteID());
+ String path =
((ContentFileField)source).getValue(jParams, EntryLoadRequest.STAGED);
+ DAVFileAccess sourceFile = new
DAVFileAccess(jParams, sourceSite, jParams.getUser(), path);
+ ie.ensureFile(sourceFile, jParams,
destSite);
+ }
- if (source instanceof ContentFileField) {
- JahiaSite sourceSite =
ServicesRegistry.getInstance().getJahiaSitesService().getSite(source.getSiteID());
- String path =
((ContentFileField)source).getValue(jParams, EntryLoadRequest.STAGED);
- DAVFileAccess sourceFile = new
DAVFileAccess(jParams, sourceSite, jParams.getUser(), path);
- ie.ensureFile(sourceFile, jParams, destSite);
+ ImportHandler handler = new
ImportHandler(picker,jParams, language, destSite);
+ ie.export(source, language, handler, null,
jParams, null ,EntryLoadRequest.STAGED, null, true);
}
-
- ImportHandler handler = new
ImportHandler(picker,jParams, language, destSite);
- ie.export(source, language, handler, null,
jParams, null ,EntryLoadRequest.STAGED, null, true);
}
}
}
