Author: cmailleux
Date: Wed Oct 17 15:41:15 2007
New Revision: 18901
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18901&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=3D18901&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:41:15 2007
@@ -827,7 +827,7 @@
//check if site filtering is active
String filterSiteKey=3Dnull;
if (siteID!=3D-1)
- filterSiteKey =3D "siteid_"+siteID+"/"; //this is the site we =
want to filter on
+ filterSiteKey =3D "siteid_"+siteID; //this is the site we want=
to filter on
=
try {
DataNode rootContentNode =3D cache.get(JesiObject.OVERALL_NODE=
KEY);
@@ -841,7 +841,7 @@
=
//(optionally) check if we want nodes from this si=
te:
String siteNodeFqnStr =3D siteNode.getFqn().toStri=
ng();
- if (filterSiteKey!=3Dnull && siteNodeFqnStr.indexO=
f(filterSiteKey)!=3D-1) {
+ if (filterSiteKey!=3Dnull && !siteNodeFqnStr.endsW=
ith(filterSiteKey)) {
continue; //nope, so ignore results from this =
site and move on
}
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
