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-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
61357: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      61292: MNT-10608 : java.net.SocketException: Software caused connection abort: recv failed
      'IOException' exception is now handled in the same way as 'JSONException' exception. No more exceptions are thrown.
      Also license header has been added


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62413 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 15:12:46 +00:00
parent 34f6abe455
commit b9ab82bd33
1 changed files with 45 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
source/java/org/alfresco/repo/web/scripts/solr/AlfrescoModelsDiff.java
View File

@@ -1,3 +1,21 @@
/*
* Copyright (C) 2005-2014 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.repo.web.scripts.solr;
import java.io.IOException;
@@ -28,6 +46,10 @@ public class AlfrescoModelsDiff extends DeclarativeWebScript
{
protected static final Log logger = LogFactory.getLog(AlfrescoModelsDiff.class);
private static final String MSG_IO_EXCEPTION = "IO exception parsing request ";
private static final String MSG_JSON_EXCEPTION = "Unable to fetch model changes from ";
private SOLRTrackingComponent solrTrackingComponent;
public void setSolrTrackingComponent(SOLRTrackingComponent solrTrackingComponent)
@@ -48,22 +70,31 @@ public class AlfrescoModelsDiff extends DeclarativeWebScript
}
catch (IOException e)
{
throw new WebScriptException("IO exception parsing request", e);
setExceptionResponse(req, status, MSG_IO_EXCEPTION, Status.STATUS_INTERNAL_SERVER_ERROR, e);
return null;
}
catch (JSONException e)
{
setExceptionResponse(req, status, MSG_JSON_EXCEPTION, Status.STATUS_BAD_REQUEST, e);
return null;
}
}
private void setExceptionResponse(WebScriptRequest req, Status responseStatus, String responseMessage, int statusCode, Exception e)
{
String message = responseMessage + req;
if (logger.isDebugEnabled())
{
logger.warn("Unable to fetch model changes from " + req, e);
logger.warn(message, 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;
logger.warn(message);
}
responseStatus.setCode(statusCode, message);
responseStatus.setException(e);
}
private Map<String, Object> buildModel(WebScriptRequest req) throws JSONException, IOException