From a9786e1c991ae55423980295653e990699ef1343 Mon Sep 17 00:00:00 2001 From: Pavel Yurke Date: Wed, 18 Sep 2013 15:55:35 +0000 Subject: [PATCH] MNT-9401: CLONE - After Installed Records Management AMP in alfresco.log "Invalid JSON" error. Log warning instead of throwing WebScriptException if invalid POST modelsdiff request was sent by SOLR. It can happen if SOLR starts sent requests while Alfresco is not up. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55476 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/web/scripts/solr/AlfrescoModelsDiff.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/web/scripts/solr/AlfrescoModelsDiff.java b/source/java/org/alfresco/repo/web/scripts/solr/AlfrescoModelsDiff.java index 1ac3afa168..e914c59d04 100644 --- a/source/java/org/alfresco/repo/web/scripts/solr/AlfrescoModelsDiff.java +++ b/source/java/org/alfresco/repo/web/scripts/solr/AlfrescoModelsDiff.java @@ -52,7 +52,17 @@ public class AlfrescoModelsDiff extends DeclarativeWebScript } catch(JSONException e) { - throw new WebScriptException("Invalid JSON", e); + if (logger.isDebugEnabled()) + { + logger.warn("Unable to fetch model changes from " + req, e); + } + else + { + logger.warn("Unable to fetch model changes from " + req); + } + status.setCode(Status.STATUS_BAD_REQUEST, "Unable to fetch model changes from " + req); + status.setException(e); + return null; } }