Author: shuber
Date: Fri Jun 15 13:14:11 2007
New Revision: 17576
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17576&repname=
=3Djahia
Log:
Fixed missing check to deactivate jahia link updates when using expiration =
only output cache.
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/JahiaP=
ageField.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/=
JahiaPageField.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/data/fields/JahiaPageField.java&rev=3D17576=
&repname=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/data/fields/JahiaP=
ageField.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/JahiaP=
ageField.java Fri Jun 15 13:14:11 2007
@@ -140,10 +140,10 @@
// now let's update the xref manager from this pag=
e field to
// the actual page (actually the call uses the rev=
erse order
// for parameter call)
- if (jParams.settings().lookupBoolean(SettingsBean.
- OUTPUT_CACHE_ACTIVATED)) {
+ if ( (jParams.settings().lookupBoolean(SettingsBea=
n.OUTPUT_CACHE_ACTIVATED)) &&
+ (!jParams.settings().isOutputCacheExpirationO=
nly()) ) {
if (ContentPageXRefManager.getInstance() !=3D =
null) {
- //JahiaConsole.println("PageXRefManager","=
PageXRefManager instance is not null ");
+ //JahiaConsole.println("PageXReCorefManage=
r","PageXRefManager instance is not null ");
if (jParams !=3D null) {
try {
Set pageIDs =3D ContentPageXRefMan=
ager.getInstance().getPageIDs(thePage.getID());
@@ -157,7 +157,7 @@
}
}
} else {
- JahiaConsole.println("PageXRefManager", "P=
ageXRefManager instance is null ");
+ logger.error("PageXRefManager instance is =
null ");
}
}
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
