Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

63066: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62716: Merged DEV to V4.2-BUG-FIX (4.2.2)
         62654: MNT-10679: BM-0012: Run v420b1494_01: Exception from executeScript
          - Report about IllegalStateException to LOG.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64254 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-03-14 15:32:57 +00:00
parent 8e7f620ac1
commit d6fb189489

View File

@@ -73,6 +73,24 @@ public class TenantWebScriptServlet extends WebScriptServlet
WebScriptServletRuntime runtime = getRuntime(req, res); WebScriptServletRuntime runtime = getRuntime(req, res);
runtime.executeScript(); runtime.executeScript();
} }
catch (IllegalStateException e)
{
if(e.getMessage().contains("getOutputStream() has already been called for this response"))
{
if(logger.isDebugEnabled())
{
logger.warn("Client has cut off communication", e);
}
else
{
logger.warn("Client has cut off communication");
}
}
else
{
throw e;
}
}
finally finally
{ {
// clear threadlocal // clear threadlocal