mcardle 2005/11/18 17:10:51 CET
Modified files:
src/org/jahia/esi/invalidation/services Invalidator.java
Log:
* added port independent invalidation
Revision Changes Path
1.3 +8 -4
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.2&r2=1.3&f=h
Index: Invalidator.java
===================================================================
RCS file:
/home/cvs/repository/esi_server/src/org/jahia/esi/invalidation/services/Invalidator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Invalidator.java 4 Nov 2005 16:53:37 -0000 1.2
+++ Invalidator.java 18 Nov 2005 16:10:51 -0000 1.3
@@ -284,7 +284,7 @@
{
public InputSource resolveEntity(java.lang.String publicId,
java.lang.String systemId)
throws SAXException, java.io.IOException {
- log.debug("detected systemId "+systemId);
+ //log.debug("detected systemId "+systemId);
if (systemId.equals("WCSinvalidation.dtd")
|| systemId.equals("internal:///WCSinvalidation.dtd")
||
systemId.equals("file:///C:/EsiServerTomcat2/bin/WCSinvalidation.dtd")
@@ -407,11 +407,15 @@
//Deal with ADVANCEDSELECTOR attributes
if (advSel.getURIEXP()!=null) {
Matcher mUriExp =
getReformatedMatcher(advSel.getURIEXP());
- matchers.addElement(new Object[]{mUriExp, MATCHES});
+ matchers.addElement(new Object[]{mUriExp, MATCHES});
//TODO: could be find without reformat
}
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(":");
+ String host = hostWithPort[0];
matchers.addElement(
- new
java.lang.Object[]{Pattern.compile(advSel.getHOST()).matcher(""), FIND}
+ new
java.lang.Object[]{Pattern.compile(host).matcher(""), FIND}
);
}
if (advSel.getURIPREFIX()!=null) {
@@ -450,7 +454,7 @@
else
log.error("This is impossible");
- if (success) {
+ if (success==false) {
validMatch = false;
break;
}
