From 3200944b6d6780d52e4467d3ea9a91dc29768611 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 12 Feb 2014 09:33:33 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 59902: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3) 59806: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2) 59716: MNT-10037 : WebDAV PutMethod needs better test coverage Changed the fallout of the PutMethod.executeImpl() to run in the same transaction to prevent deadlock. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62222 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/repo/webdav/PutMethod.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/webdav/PutMethod.java b/source/java/org/alfresco/repo/webdav/PutMethod.java index 878133bbf6..3c585cd3b3 100644 --- a/source/java/org/alfresco/repo/webdav/PutMethod.java +++ b/source/java/org/alfresco/repo/webdav/PutMethod.java @@ -300,7 +300,7 @@ public class PutMethod extends WebDAVMethod implements ActivityPostProducer } return null; } - }, false, true); + }, false, false); } throw new WebDAVServerException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e); }