From 8dc34a60c0cf94c212dab7acb5818b3dedeae5b0 Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Fri, 24 Jun 2011 14:54:45 +0000 Subject: [PATCH] Merged V3.4-BUG-FIX to HEAD 28546: Merged V3.4 to V3.4-BUG-FIX 28544: Fixes truncated German strings 28567: AccessAuditorTest and PropertyAccessFilterTest added to AuditTestSuite. These tests had been excluded by build.xml. 28570: Fixed ALF-7961: Constraint value with a comma shows multiple fields 28574: ALF-9222 / ALF-9290: Cannot edit a file using Webdav (MacOS specific) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28576 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/repo/webdav/HierarchicalMethod.java | 6 +++--- source/java/org/alfresco/repo/webdav/WebDAV.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/java/org/alfresco/repo/webdav/HierarchicalMethod.java b/source/java/org/alfresco/repo/webdav/HierarchicalMethod.java index 96124f0415..c47a929df7 100644 --- a/source/java/org/alfresco/repo/webdav/HierarchicalMethod.java +++ b/source/java/org/alfresco/repo/webdav/HierarchicalMethod.java @@ -37,7 +37,7 @@ public abstract class HierarchicalMethod extends WebDAVMethod // Request parameters protected String m_strDestinationPath; - protected boolean m_overwrite = false; + protected boolean m_overwrite = true; /** * Default constructor @@ -137,9 +137,9 @@ public abstract class HierarchicalMethod extends WebDAVMethod // Check if the copy should overwrite an existing file String strOverwrite = m_request.getHeader(WebDAV.HEADER_OVERWRITE); - if (strOverwrite != null && strOverwrite.equals(WebDAV.T)) + if (strOverwrite != null && strOverwrite.equals(WebDAV.F)) { - m_overwrite = true; + m_overwrite = false; } } diff --git a/source/java/org/alfresco/repo/webdav/WebDAV.java b/source/java/org/alfresco/repo/webdav/WebDAV.java index 4ec664efc0..67352adb7e 100644 --- a/source/java/org/alfresco/repo/webdav/WebDAV.java +++ b/source/java/org/alfresco/repo/webdav/WebDAV.java @@ -142,7 +142,7 @@ public class WebDAV public static final String HEADER_VALUE_SEPARATOR = ","; public static final String ZERO = "0"; public static final String ONE = "1"; - public static final String T = "T"; + public static final String F = "F"; // Strings used in WebDAV XML payload