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

ALF-510 : errorOnOverwrite not implemented for overwriting files.

Browse Source 
- now overwriting a file does result in an error if there is a pre-existing file.
  - also fixed deployment report to have the stack trace even if there is a deployment report.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19824 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2010-04-12 17:12:31 +00:00
parent b17f139fb0
commit d3816ad09b
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/java/org/alfresco/repo/avm/actions/AVMDeployWebsiteAction.java
View File

@@ -534,6 +534,7 @@ public class AVMDeployWebsiteAction extends ActionExecuterAbstractBase
if (report == null)
{
// There is no report
if (error == null)
{
writer.putContent("");
@@ -549,7 +550,7 @@ public class AVMDeployWebsiteAction extends ActionExecuterAbstractBase
}
else
{
// TODO: revisit this, is it better to stream to a temp file?
// There is a deployment report
StringBuilder builder = new StringBuilder();
for (DeploymentEvent event : report)
{
@@ -559,6 +560,18 @@ public class AVMDeployWebsiteAction extends ActionExecuterAbstractBase
builder.append("\r\n");
}
if(error != null)
{
builder.append("\r\n");
// add the full stack trace of the error as the content
StringWriter stack = new StringWriter();
PrintWriter stackPrint = new PrintWriter(stack);
error.printStackTrace(stackPrint);
builder.append(stack.toString());
}
writer.putContent(builder.toString());
}