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

71622: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      71378: Merged V4.2.2 (4.2.2) to V4.2-BUG-FIX (4.2.3)
         << Again. 71376 should not have been RECORD ONLY >>
         71280: Merged DEV to V4.2.2-PATHCES (4.2.2)
            70814: MNT-10679: BM-0012: Run v420b1494_01: Exception from executeScript
             - Handle ClientAbortException 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74705 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-06-25 15:32:32 +00:00
parent 9a54762925
commit 66245b22b5

View File

@@ -519,7 +519,17 @@ public class RepositoryContainer extends AbstractRuntimeContainer
catch (IOException ioe)
{
Throwable socketException = ExceptionStackUtil.getCause(ioe, SocketException.class);
if (socketException != null && socketException.getMessage().contains("Broken pipe"))
Class<?> clientAbortException = null;
try
{
clientAbortException = Class.forName("org.apache.catalina.connector.ClientAbortException");
}
catch (ClassNotFoundException e)
{
// do nothing
}
// Note: if you need to look for more exceptions in the stack, then create a static array and pass it in
if ((socketException != null && socketException.getMessage().contains("Broken pipe")) || (clientAbortException != null && ExceptionStackUtil.getCause(ioe, clientAbortException) != null))
{
if (logger.isDebugEnabled())
{