Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent 0a36e2af67
commit ab4ca7177f
1576 changed files with 36419 additions and 8603 deletions

View File

@@ -689,13 +689,17 @@ public class ContentServiceImpl implements ContentService, ApplicationContextAwa
done = true;
return;
}
catch (AlfrescoRuntimeException e)
catch (Exception e)
{
if (exceptions == null)
{
exceptions = new ArrayList<AlfrescoRuntimeException>();
}
exceptions.add(e);
if (!(e instanceof AlfrescoRuntimeException))
{
e = new AlfrescoRuntimeException(e.getMessage(), e);
}
exceptions.add((AlfrescoRuntimeException)e);
// Set a new reader to refresh the input stream.
reader = reader.getReader();