Author: cmailleux
Date: Thu Jul 12 17:57:01 2007
New Revision: 17973
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17973&repname=
=3Djahia
Log:
Port of commit [17261] Resolve issue JAHIA-1661
Modified:
trunk/core/src/java/org/jahia/bin/JahiaErrorDisplay.java
Modified: trunk/core/src/java/org/jahia/bin/JahiaErrorDisplay.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/bin/JahiaErrorDisplay.java&rev=3D17973&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
--- trunk/core/src/java/org/jahia/bin/JahiaErrorDisplay.java (original)
+++ trunk/core/src/java/org/jahia/bin/JahiaErrorDisplay.java Thu Jul 12 17:=
57:01 2007
@@ -216,18 +216,22 @@
if (isSiteErrorEnabled) {
//check for site-specific error pages directory (errors di=
r)
logger.debug("site error enabled: checking the availabilit=
y of errors directory");
- contextPathToDestination =3D context.getRealPath(DISPATCH_=
SITES_ROOT + site.getSiteKey() + "/" + DISPATCH_DIRECTORY);
- if (contextPathToDestination !=3D null) {
- File dir =3D new File(contextPathToDestination);//chec=
k on directory
+ contextPathToDestination =3D DISPATCH_SITES_ROOT + site.ge=
tSiteKey() + "/" + DISPATCH_DIRECTORY;
+ fullPathToDestination =3D context.getRealPath(contextPathT=
oDestination);
+ if (fullPathToDestination !=3D null) {
+ File dir =3D new File(fullPathToDestination);//check o=
n directory
if (!dir.exists()) {
logger.debug("not found errors directory for the s=
ite " + site.getSiteKey());
isSiteErrorEnabled =3D false;
contextPathToDestination =3D DISPATCH_DESTINATION;
+ } else {
+ contextPathToDestination =3D DISPATCH_SITES_ROOT +=
site.getSiteKey() + "/" + DISPATCH_DIRECTORY+"/error.jsp";
}
} else {
isSiteErrorEnabled =3D false;
contextPathToDestination =3D DISPATCH_DESTINATION;
}
+ fullPathToDestination =3D context.getRealPath(contextPathT=
oDestination);
}
=
File jspFile =3D new File(fullPathToDestination);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
