mcardle 2005/11/22 18:24:22 CET
Modified files:
src/org/jahia/esi/invalidation/services Invalidator.java
Log:
* temporarily disabled HOST-based invalidation
Revision Changes Path
1.4 +5 -1
esi_server/src/org/jahia/esi/invalidation/services/Invalidator.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/esi_server/src/org/jahia/esi/invalidation/services/Invalidator.java.diff?r1=1.3&r2=1.4&f=h
Index: Invalidator.java
===================================================================
RCS file:
/home/cvs/repository/esi_server/src/org/jahia/esi/invalidation/services/Invalidator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Invalidator.java 18 Nov 2005 16:10:51 -0000 1.3
+++ Invalidator.java 22 Nov 2005 17:24:22 -0000 1.4
@@ -409,7 +409,11 @@
Matcher mUriExp =
getReformatedMatcher(advSel.getURIEXP());
matchers.addElement(new Object[]{mUriExp, MATCHES});
//TODO: could be find without reformat
}
+ //TODO: restore HOST once it has been tested in clustered
mode !!!!!!!!!!!!!!!!!!
if (advSel.getHOST()!=null) {
+ continue;
+ }
+ /*if (advSel.getHOST()!=null) {
//TODO: currently getting rid of port number in host
because it is 8080 for fragments and 8081 for images/CSS,
//TODO: so to avoid confusion, just get rid of them for
the moment
String[] hostWithPort = advSel.getHOST().split(":");
@@ -417,7 +421,7 @@
matchers.addElement(
new
java.lang.Object[]{Pattern.compile(host).matcher(""), FIND}
);
- }
+ }*/
if (advSel.getURIPREFIX()!=null) {
matchers.addElement(
new
java.lang.Object[]{Pattern.compile(advSel.getURIPREFIX()).matcher(""), FIND}
