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

Merged HEAD (5.2) to 5.2.N (5.2.1)

Browse Source 
126482 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122590 jkaabimofrad: RA-841: Fixed the status code for the large file upload. Also, added a new exception with 507 status code to be thrown, when "ContentQuotaException" occurs.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126826 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 11:38:01 +00:00
parent fbe19dfc15
commit 66e21fc302
5 changed files with 71 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/java/org/alfresco/rest/api/impl/NodesImpl.java
View File

@@ -64,6 +64,7 @@ import org.alfresco.rest.api.model.UserInfo;
import org.alfresco.rest.framework.core.exceptions.ApiException;
import org.alfresco.rest.framework.core.exceptions.ConstraintViolatedException;
import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
import org.alfresco.rest.framework.core.exceptions.InsufficientStorageException;
import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
import org.alfresco.rest.framework.core.exceptions.RequestEntityTooLargeException;
@@ -1715,11 +1716,11 @@ public class NodesImpl implements Nodes
}
catch (ContentQuotaException cqe)
{
throw new RequestEntityTooLargeException(cqe.getMessage());
throw new InsufficientStorageException();
}
catch (ContentLimitViolationException clv)
{
throw new ConstraintViolatedException(clv.getMessage());
throw new RequestEntityTooLargeException(clv.getMessage());
}
catch (Exception ex)
{