inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/master' into feature/RM-5391_UI_Test_Classifcation_Mark_Indicator

Browse Source 
# Conflicts:
#	rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java
This commit is contained in:
Rodica Sutu
2017-09-11 12:47:21 +03:00
parent a8123895ae 9383eaae70
commit 38f69fab50
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java
View File

@@ -83,6 +83,7 @@ public abstract class BaseAPI
@Autowired @Autowired
private AlfrescoHttpClientFactory alfrescoHttpClientFactory; private AlfrescoHttpClientFactory alfrescoHttpClientFactory;
@Autowired @Autowired
private ContentService contentService; private ContentService contentService;
@@ -406,9 +407,13 @@ public abstract class BaseAPI
{ {
responseBody = new JSONObject(EntityUtils.toString(response.getEntity())); responseBody = new JSONObject(EntityUtils.toString(response.getEntity()));
} }
catch (ParseException | IOException | JSONException error) catch (JSONException error)
{ {
LOGGER.error("Parsing message body failed", error); LOGGER.error("Converting message body to JSON failed. Body: {}", responseBody, error);
}
catch (ParseException | IOException error)
{
LOGGER.error("Parsing message body failed.", error);
} }
switch (response.getStatusLine().getStatusCode()) switch (response.getStatusLine().getStatusCode())