diff --git a/src/helma/framework/ResponseTrans.java b/src/helma/framework/ResponseTrans.java
index 55f84105..db117c2a 100644
--- a/src/helma/framework/ResponseTrans.java
+++ b/src/helma/framework/ResponseTrans.java
@@ -541,12 +541,14 @@ public final class ResponseTrans extends Writer implements Serializable {
writeXmlRpcError(new RuntimeException(message));
} else {
status = 500;
- write("");
- write("Error in application ");
- write(appName);
- write("
");
- write(message);
- write("");
+ if (!"true".equalsIgnoreCase(app.getProperty("suppressErrorPage"))) {
+ write("");
+ write("Error in application ");
+ write(appName);
+ write("
");
+ write(message);
+ write("");
+ }
}
}
diff --git a/src/helma/servlet/AbstractServletClient.java b/src/helma/servlet/AbstractServletClient.java
index 28ae8f96..0da907d0 100644
--- a/src/helma/servlet/AbstractServletClient.java
+++ b/src/helma/servlet/AbstractServletClient.java
@@ -366,19 +366,21 @@ public abstract class AbstractServletClient extends HttpServlet {
response.setStatus(code);
response.setContentType("text/html");
- Writer writer = response.getWriter();
+ if (!"true".equalsIgnoreCase(getApplication().getProperty("suppressErrorPage"))) {
+ Writer writer = response.getWriter();
- writer.write("");
- writer.write("Error in application ");
- try {
- writer.write(getApplication().getName());
- } catch (Exception besafe) {
- // ignore
+ writer.write("");
+ writer.write("Error in application ");
+ try {
+ writer.write(getApplication().getName());
+ } catch (Exception besafe) {
+ // ignore
+ }
+ writer.write("
");
+ writer.write(message);
+ writer.write("");
+ writer.flush();
}
- writer.write("
");
- writer.write(message);
- writer.write("");
- writer.flush();
}
void sendRedirect(HttpServletRequest req, HttpServletResponse res, String url) {