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/HEAD/root@126482 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jamal Kaabi-Mofrad
2016-05-10 11:09:24 +00:00
parent 50dffcc569
commit 256e3e5254
5 changed files with 71 additions and 2 deletions

View File

@@ -57,6 +57,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;
@@ -1708,11 +1709,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)
{