Author: mcardle
Date: Thu Aug 17 07:12:34 2006
New Revision: 14925
URL: https://svndev.jahia.net/websvn/listing.php?sc=1&rev=14925&repname=jahia
Log:
* minor updates
Modified:
trunk/core/src/java/org/jahia/hibernate/manager/JahiaObjectManager.java
trunk/core/src/java/org/jahia/services/esi/EsiInvalidationEventListener.java
Modified:
trunk/core/src/java/org/jahia/hibernate/manager/JahiaObjectManager.java
URL:
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/java/org/jahia/hibernate/manager/JahiaObjectManager.java&rev=14925&repname=jahia
==============================================================================
--- trunk/core/src/java/org/jahia/hibernate/manager/JahiaObjectManager.java
(original)
+++ trunk/core/src/java/org/jahia/hibernate/manager/JahiaObjectManager.java Thu
Aug 17 07:12:34 2006
@@ -362,14 +362,14 @@
if (logger.isDebugEnabled()) logger.debug("Time publishing
triggering invalidation of "+curContentObject);
- JahiaEvent objectCreatedEvent = new JahiaEvent(this,
context, curContentObject);
+ JahiaEvent objectUpdatedEvent = new JahiaEvent(this,
context, curContentObject);
ServicesRegistry.getInstance ().getJahiaEventService ()
- .fireContentObjectUpdated(objectCreatedEvent);
+ .fireContentObjectUpdated(objectUpdatedEvent);
if (Jahia.getSettings().isEsiCacheActivated()) {
//if the current object is a page, need to flush all
objects affected
- //by publish time change, and sub-pages also, since
there is a tree like inheretence
+ //by publish time change, and sub-pages also, since
there is a tree like inheritence
//of publishing dates
if (curContentObject instanceof ContentPage) {
Modified:
trunk/core/src/java/org/jahia/services/esi/EsiInvalidationEventListener.java
URL:
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/java/org/jahia/services/esi/EsiInvalidationEventListener.java&rev=14925&repname=jahia
==============================================================================
---
trunk/core/src/java/org/jahia/services/esi/EsiInvalidationEventListener.java
(original)
+++
trunk/core/src/java/org/jahia/services/esi/EsiInvalidationEventListener.java
Thu Aug 17 07:12:34 2006
@@ -649,8 +649,6 @@
public void flushEsiCacheEvent( JahiaEvent je) {
if (logger.isDebugEnabled()) logger.debug("caught flushEsiCacheEvent
event "+ je);
-
ServicesRegistry.getInstance().getEsiService().resetAllFirstExecuteAndAclUserNames();
-
//when a language change is initiated, only clear the ESI cache
entries for this site
if (je.getSource() instanceof ManageSiteLanguages
//when a site permission change is initiated, only clear the ESI cache
entries for this site
@@ -663,6 +661,9 @@
if (logger.isDebugEnabled()) logger.debug("[esi] :
"+je.getSource()+" change triggering invalidation of Site [" +
site.getSiteKey() + "]");
return;
}
+ //no need to do a resetAll for site Invalidation since it's done in
EsiService.removeSite()
+
+
ServicesRegistry.getInstance().getEsiService().resetAllFirstExecuteAndAclUserNames();
if (je.getSource() instanceof
org.jahia.services.deamons.filewatcher.FileListSync) {
clearEntireCache(je, "flushEsiCacheEvent-Everything",false);
//clears everything, not just HTML in ESI cache
@@ -740,7 +741,7 @@
return;
}
- public void pageDeleted( JahiaEvent je) {
+ public void pageDeleted( JahiaEvent je) {
JahiaPage jpage = (JahiaPage) je.getObject();
//remove it from the contentID cache
