OFBiz › OFBiz - Commits

svn commit: r560486 - /ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

jonesde

svn commit: r560486 - /ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java

Author: jonesde
Date: Fri Jul 27 21:10:18 2007
New Revision: 560486

URL: http://svn.apache.org/viewvc?view=rev&rev=560486
Log:
Some improvements to handling cases where rendering the error messages fails, and the alternate fails, etc

Modified:
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java

Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java?view=diff&rev=560486&r1=560485&r2=560486
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java Fri Jul 27 21:10:18 2007
@@ -215,22 +215,33 @@
if (request.getAttribute("_ERROR_OCCURRED_") == null && rd != null) {
request.setAttribute("_ERROR_OCCURRED_", Boolean.TRUE);
Debug.logError("Including errorPage: " + errorPage, module);
- rd.include(request, response);
+
+ // NOTE DEJ20070727 after having trouble with all of these, try to get the page out and as a last resort just send something back
+ try {
+ rd.include(request, response);
+ } catch (Throwable t) {
+ Debug.logWarning("Error while trying to send error page using rd.include (will try response.getOutputStream or response.getWriter): " + t.toString(), module);

- /* For some reason (with Tomcat only?) this isn't making it to the browser, and neither is the rd.include...
- String errorMessage = "<html><body>ERROR in error page, (infinite loop or error page not found with name [" + errorPage + "]), but here is the text just in case it helps you: " + request.getAttribute("ERROR_MESSAGE_") + "</body></html>";
- if (UtilJ2eeCompat.useOutputStreamNotWriter(getServletContext())) {
- response.getOutputStream().print(errorMessage);
- } else {
- response.getWriter().print(errorMessage);
+ String errorMessage = "ERROR rendering error page [" + errorPage + "], but here is the error text: " + request.getAttribute("_ERROR_MESSAGE_");
+ try {
+ if (UtilJ2eeCompat.useOutputStreamNotWriter(getServletContext())) {
+ response.getOutputStream().print(errorMessage);
+ } else {
+ response.getWriter().print(errorMessage);
+ }
+ } catch (Throwable t2) {
+ int errorToSend = HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
+ Debug.logWarning("Error while trying to write error message using response.getOutputStream or response.getWriter: " + t.toString() + "; sending error code [" + errorToSend + "], and message [" + errorMessage + "]", module);
+ response.sendError(errorToSend, errorMessage);
+ }
}
- */
+
} else {
if (rd == null) {
Debug.logError("Could not get RequestDispatcher for errorPage: " + errorPage, module);
}

- String errorMessage = "<html><body>ERROR in error page, (infinite loop or error page not found with name [" + errorPage + "]), but here is the text just in case it helps you: " + request.getAttribute("ERROR_MESSAGE_") + "</body></html>";
+ String errorMessage = "<html><body>ERROR in error page, (infinite loop or error page not found with name [" + errorPage + "]), but here is the text just in case it helps you: " + request.getAttribute("_ERROR_MESSAGE_") + "</body></html>";
if (UtilJ2eeCompat.useOutputStreamNotWriter(getServletContext())) {
response.getOutputStream().print(errorMessage);
} else {