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 
126522 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      123025 gjames: RA-757: Handle integrity exceptions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126866 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 11:58:45 +00:00
parent 2e00e5c219
commit ef3ca313a1
8 changed files with 126 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/java/org/alfresco/rest/framework/webscripts/AbstractResourceWebScript.java
View File

@@ -32,6 +32,7 @@ import java.util.List;
import java.util.ListIterator;
import java.util.Map;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.repo.node.integrity.IntegrityException;
import org.alfresco.repo.tenant.TenantUtil;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
@@ -153,17 +154,9 @@ public abstract class AbstractResourceWebScript extends ApiWebScript implements
}
}
catch (IntegrityException intException)
catch (AlfrescoRuntimeException | ApiException | WebScriptException xception )
{
renderErrorResponse(resolveException(intException), res);
}
catch (ApiException apiException)
{
renderErrorResponse(resolveException(apiException), res);
}
catch (WebScriptException webException)
{
renderErrorResponse(resolveException(webException), res);
renderErrorResponse(resolveException(xception), res);
}
catch (RuntimeException runtimeException)
{

2
source/java/org/alfresco/rest/framework/webscripts/ApiWebScript.java
View File

@@ -168,7 +168,7 @@ public abstract class ApiWebScript extends AbstractWebScript
}
}
private Api determineApi(Map<String, String> templateVars)
public Api determineApi(Map<String, String> templateVars)
{
String apiScope = templateVars.get("apiScope");
String apiVersion = templateVars.get("apiVersion");