You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mm...@apache.org on 2007/07/27 10:39:40 UTC
svn commit: r560146 - in
/myfaces/core/branches/1_2_1/api/src/main/java/javax/faces/webapp:
FacesServlet.java _ErrorPageWriter.java
Author: mmarinschek
Date: Fri Jul 27 01:39:38 2007
New Revision: 560146
URL: http://svn.apache.org/viewvc?view=rev&rev=560146
Log:
https://issues.apache.org/jira/browse/MYFACES-1685: exception if response is commited, prepare exception stack, fix boolean handling, logging if error-page is shown
Modified:
myfaces/core/branches/1_2_1/api/src/main/java/javax/faces/webapp/FacesServlet.java
myfaces/core/branches/1_2_1/api/src/main/java/javax/faces/webapp/_ErrorPageWriter.java
Modified: myfaces/core/branches/1_2_1/api/src/main/java/javax/faces/webapp/FacesServlet.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/1_2_1/api/src/main/java/javax/faces/webapp/FacesServlet.java?view=diff&rev=560146&r1=560145&r2=560146
==============================================================================
--- myfaces/core/branches/1_2_1/api/src/main/java/javax/faces/webapp/FacesServlet.java (original)
+++ myfaces/core/branches/1_2_1/api/src/main/java/javax/faces/webapp/FacesServlet.java Fri Jul 27 01:39:38 2007
@@ -188,7 +188,11 @@
}
}
- private boolean getBooleanValue(String initParameter, boolean defaultVal) {
- return initParameter != null && (initParameter.equalsIgnoreCase("on") || initParameter.equals("1") || initParameter.equalsIgnoreCase("true")) || defaultVal;
+ private static boolean getBooleanValue(String initParameter, boolean defaultVal) {
+
+ if(initParameter == null || initParameter.trim().length()==0)
+ return defaultVal;
+
+ return (initParameter.equalsIgnoreCase("on") || initParameter.equals("1") || initParameter.equalsIgnoreCase("true"));
}
}
Modified: myfaces/core/branches/1_2_1/api/src/main/java/javax/faces/webapp/_ErrorPageWriter.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/1_2_1/api/src/main/java/javax/faces/webapp/_ErrorPageWriter.java?view=diff&rev=560146&r1=560145&r2=560146
==============================================================================
--- myfaces/core/branches/1_2_1/api/src/main/java/javax/faces/webapp/_ErrorPageWriter.java (original)
+++ myfaces/core/branches/1_2_1/api/src/main/java/javax/faces/webapp/_ErrorPageWriter.java Fri Jul 27 01:39:38 2007
@@ -15,6 +15,9 @@
*/
package javax.faces.webapp;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import javax.faces.context.FacesContext;
import java.io.Writer;
import java.beans.BeanInfo;
@@ -49,6 +52,8 @@
*/
public final class _ErrorPageWriter {
+ private static final Log log = LogFactory.getLog(_ErrorPageWriter.class);
+
private final static String TS = "<";
private static final String ERROR_TEMPLATE = "META-INF/rsc/facelet-dev-error.xml";
@@ -317,6 +322,11 @@
Writer writer = httpResp.getWriter();
debugHtml(writer, facesContext, ex);
+
+ log.error("An exception occurred.",ex);
+ }
+ else {
+ throwException(ex);
}
}
else {
@@ -347,6 +357,9 @@
}
static void throwException(Exception e) throws IOException, ServletException {
+
+ prepareExceptionStack(e.getCause());
+
if (e instanceof IOException)
{
throw (IOException)e;