shuber 2005/11/04 16:24:53 CET
Modified files:
core/src/java/org/jahia/bin JahiaErrorDisplay.java
core/src/java/org/jahia/params ProcessingContext.java
Log:
- Added code to ignore invalid field, container and container list id since
it seems the Googlebot generates these errors
- Added query string in mail error reporting.
Revision Changes Path
1.6 +6 -2 jahia/core/src/java/org/jahia/bin/JahiaErrorDisplay.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/bin/JahiaErrorDisplay.java.diff?r1=1.5&r2=1.6&f=h
1.10 +24 -9
jahia/core/src/java/org/jahia/params/ProcessingContext.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/params/ProcessingContext.java.diff?r1=1.9&r2=1.10&f=h
Index: JahiaErrorDisplay.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/bin/JahiaErrorDisplay.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JahiaErrorDisplay.java 22 Jun 2005 12:32:57 -0000 1.5
+++ JahiaErrorDisplay.java 4 Nov 2005 15:24:52 -0000 1.6
@@ -1,4 +1,4 @@
-// $Id: JahiaErrorDisplay.java,v 1.5 2005/06/22 12:32:57 cmailleux Exp $
+// $Id: JahiaErrorDisplay.java,v 1.6 2005/11/04 15:24:52 shuber Exp $
//
// ____.
// __/\ ______| |__/\. _______
@@ -358,7 +358,11 @@
strOut.println("");
strOut.println("Error : " + t.getMessage());
strOut.println("");
- strOut.println("URL : " + request.getRequestURL() + " Method :
" + request.getMethod());
+ strOut.println("URL : " + request.getRequestURL());
+ if (request.getQueryString() != null) {
+ strOut.println("?" + request.getQueryString());
+ }
+ strOut.println(" Method : " + request.getMethod());
strOut.println("");
strOut.println("Remote host : " + request.getRemoteHost() + "
Remote Address : " + request.getRemoteAddr());
strOut.println("");
Index: ProcessingContext.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/params/ProcessingContext.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ProcessingContext.java 27 Sep 2005 10:58:40 -0000 1.9
+++ ProcessingContext.java 4 Nov 2005 15:24:52 -0000 1.10
@@ -400,19 +400,34 @@
if (getSite() != null) {
// Get the field ID information
- if (getParameter(FIELD_ID_PARAMETER) != null) {
- this.setFieldID(Integer.parseInt(getParameter(
- FIELD_ID_PARAMETER)));
+ String fieldIDStr = getParameter(FIELD_ID_PARAMETER);
+ if (fieldIDStr != null) {
+ try {
+ this.setFieldID(Integer.parseInt(fieldIDStr));
+ } catch (NumberFormatException nfe) {
+ logger.warn("Invalid field ID ["+fieldIDStr+"] in
request, ignoring...");
+ this.setFieldID(0);
+ }
}
- if (getParameter(CONTAINER_ID_PARAMETER) != null) {
- this.setContainerID(Integer.parseInt(getParameter(
- CONTAINER_ID_PARAMETER)));
+ String containerIDStr = getParameter(CONTAINER_ID_PARAMETER);
+ if (containerIDStr != null) {
+ try {
+
this.setContainerID(Integer.parseInt(containerIDStr));
+ } catch (NumberFormatException nfe) {
+ logger.warn("Invalid container ID
["+containerIDStr+"] in request, ignoring...");
+ this.setContainerID(0);
+ }
}
- if (getParameter(CONTAINERLIST_ID_PARAMETER) != null) {
- this.setContainerListID(Integer.parseInt(getParameter(
- CONTAINERLIST_ID_PARAMETER)));
+ String containerListIDStr =
getParameter(CONTAINERLIST_ID_PARAMETER);
+ if (containerListIDStr != null) {
+ try {
+
this.setContainerListID(Integer.parseInt(containerListIDStr));
+ } catch (NumberFormatException nfe) {
+ logger.warn("Invalid container list ID
["+containerListIDStr+"] in request, ignoring...");
+ this.setContainerListID(0);
+ }
}
int pageID = -1;
