Author: cmailleux
Date: Wed Oct 17 15:47:56 2007
New Revision: 18902
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18902&repname=
=3Djahia
Log:
try to correct issue ESI-363
By invalidating only removed site
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/esi/EsiSe=
rvice.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/esi=
/EsiService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/esi/EsiService.java&rev=3D18902&re=
pname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/esi/EsiSe=
rvice.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/esi/EsiSe=
rvice.java Wed Oct 17 15:47:56 2007
@@ -841,48 +841,50 @@
=
//(optionally) check if we want nodes from this si=
te:
String siteNodeFqnStr =3D siteNode.getFqn().toStri=
ng();
- if (filterSiteKey!=3Dnull && !siteNodeFqnStr.endsW=
ith(filterSiteKey)) {
- continue; //nope, so ignore results from this =
site and move on
- }
+ if (filterSiteKey !=3D null && siteNodeFqnStr.ends=
With(filterSiteKey)) {
+ //TODO: might need filter out anything non-pid=
Node but only if we add DataNodes to siteNodes
+ //cycle all Pages
+ Map pidNodes =3D siteNode.getChildren();
+ if (pidNodes !=3D null) {
+ Iterator pidIterator =3D pidNodes.values()=
.iterator();
+ while (pidIterator.hasNext()) {
+ DataNode pidNode =3D (DataNode) pidIte=
rator.next();
+ Template tpl =3D (Template) pidNode.ge=
t(JesiObject.TEMPLATE_OBJ_MAPKEY);
+ if (tpl !=3D null) {
+ //make sure this tpl is stored in =
the TreeCache
+ if (tpl.isAlive()) result.add(tpl);
+ //If not, then we have a Node =
remnant which shouldn't be here
+ else {
+ //TODO: Delete node???
+ if (logger.isDebugEnabled()) {
+ StringBuffer nodeDetails =
=3D new StringBuffer();
+ pidNode.print(nodeDetails,=
4);
+ logger.warn("[esi] detecte=
d empty remnant Template at Node " +
+ pidNode.getFqn=
() +
+ " Details : "=
+
+ nodeDetails.to=
String());
+ }
+ else {
+ logger.warn("[esi] detecte=
d empty remnant Template at Node " +
+ pidNode.getFqn=
());
+ }
=
- //TODO: might need filter out anything non-pidNode=
but only if we add DataNodes to siteNodes
- //cycle all Pages
- Map pidNodes =3D siteNode.getChildren();
- if (pidNodes!=3Dnull) {
- Iterator pidIterator =3D pidNodes.values().ite=
rator();
- while (pidIterator.hasNext()) {
- DataNode pidNode =3D (DataNode) pidIterat=
or.next();
- Template tpl =3D (Template) pidNode.get(Je=
siObject.TEMPLATE_OBJ_MAPKEY);
- if (tpl!=3Dnull) {
- //make sure this tpl is stored in the =
TreeCache
- if (tpl.isAlive())
- result.add(tpl);
- //If not, then we have a Node remn=
ant which shouldn't be here
+ }
+ }
else {
- //TODO: Delete node???
- if(logger.isDebugEnabled()) {
+ if (logger.isDebugEnabled()) {
StringBuffer nodeDetails =3D n=
ew StringBuffer();
pidNode.print(nodeDetails, 4);
- logger.warn("[esi] detected em=
pty remnant Template at Node "+ pidNode.getFqn()
- + " Details : " + nod=
eDetails.toString() );
+ logger.warn("[esi] detected nu=
ll Template at Node " +
+ pidNode.getFqn() +
+ " Details : " +
+ nodeDetails.toStri=
ng());
}
else {
- logger.warn("[esi] detected em=
pty remnant Template at Node "+ pidNode.getFqn() );
+ logger.warn("[esi] detected nu=
ll Template at Node " + pidNode.getFqn());
}
-
- }
- }
- else {
- if(logger.isDebugEnabled()) {
- StringBuffer nodeDetails =3D new S=
tringBuffer();
- pidNode.print(nodeDetails, 4);
- logger.warn("[esi] detected null T=
emplate at Node "+ pidNode.getFqn()
- + " Details : " + nodeDet=
ails.toString() );
- }
- else {
- logger.warn("[esi] detected null T=
emplate at Node "+ pidNode.getFqn() );
+ treeCacheNullDetectedTemplates++;
}
- treeCacheNullDetectedTemplates++;
}
}
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
