inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Removed need to extend FacesServlet (which is actually final by default)

Browse Source 
- Upgraded commons fileupload to 1.1.1

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3435 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2006-07-28 21:27:31 +00:00
parent 67395e5de8
commit cf80a2e112
4 changed files with 59 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
source/java/org/alfresco/web/bean/ErrorBean.java
View File

@@ -58,11 +58,22 @@ public class ErrorBean
}
/**
* @param lastError The lastError to set.
* @param error The lastError to set.
*/
public void setLastError(Throwable lastError)
public void setLastError(Throwable error)
{
this.lastError = lastError;
// servlet exceptions hide the actual error within the rootCause
// variable, set the base error to that and throw away the
// ServletException wrapper
if (error instanceof ServletException &&
((ServletException)error).getRootCause() != null)
{
this.lastError = ((ServletException)error).getRootCause();
}
else
{
this.lastError = error;
}
}
/**
@@ -74,29 +85,17 @@ public class ErrorBean
if (this.lastError != null)
{
StringBuilder builder = null;
Throwable cause = null;
if (this.lastError instanceof ServletException &&
((ServletException)this.lastError).getRootCause() != null)
{
// servlet exception puts the actual error in root cause!!
Throwable actualError = ((ServletException)this.lastError).getRootCause();
builder = new StringBuilder(actualError.toString());
cause = actualError.getCause();
}
else
{
builder = new StringBuilder(this.lastError.toString());
cause = this.lastError.getCause();
}
StringBuilder builder = new StringBuilder(this.lastError.toString());;
Throwable cause = this.lastError.getCause();
// build up stack trace of all causes
while (cause != null)
{
builder.append("<br/><br/>caused by:<br/>");
builder.append("\ncaused by:\n");
builder.append(cause.toString());
if (cause instanceof ServletException &&
((ServletException)cause).getRootCause() != null)
((ServletException)cause).getRootCause() != null)
{
cause = ((ServletException)cause).getRootCause();
}
@@ -107,6 +106,11 @@ public class ErrorBean
}
message = builder.toString();
// format the message for HTML display
message = message.replaceAll("<", "&lt;");
message = message.replaceAll(">", "&gt;");
message = message.replaceAll("\n", "<br/>");
}
return message;
@@ -119,18 +123,14 @@ public class ErrorBean
{
StringWriter stringWriter = new StringWriter();
PrintWriter writer = new PrintWriter(stringWriter);
this.lastError.printStackTrace(writer);
if (this.lastError instanceof ServletException &&
((ServletException)this.lastError).getRootCause() != null)
{
Throwable actualError = ((ServletException)this.lastError).getRootCause();
actualError.printStackTrace(writer);
}
else
{
this.lastError.printStackTrace(writer);
}
// format the message for HTML display
String trace = stringWriter.toString();
trace = trace.replaceAll("<", "&lt;");
trace = trace.replaceAll(">", "&gt;");
trace = trace.replaceAll("\n", "<br/>");
return stringWriter.toString().replaceAll("\r\n", "<br/>");
return trace;
}
}