From ee6510a6270e4373390cad91b9b730875e313fae Mon Sep 17 00:00:00 2001
From: Gavin Cornwell <gavin.cornwell@alfresco.com>
Date: Mon, 17 Jan 2011 15:04:37 +0000
Subject: [PATCH] =?UTF-8?q?Merged=20BRANCHES/V3.4=20to=20HEAD:=20=20=20=20?=
 =?UTF-8?q?24065:=20Fix=20for=20ALF-5064:=20Overriding=20the=20config=20fo?=
 =?UTF-8?q?r=20a=20form=20with=20an=20edit-form=20defined=20appears=20to?=
 =?UTF-8?q?=20lose=20knowledge=20of=20the=20custom=20form=20=20=20=2024471?=
 =?UTF-8?q?:=20Merged=20BRANCHES/DEV/BELARUS/V3.4-2010=5F11=5F29=20to=20BR?=
 =?UTF-8?q?ANCHES/V3.4:=20=20=20=20=20=20=20=20=2024361:=20ALF-6033:=20Sha?=
 =?UTF-8?q?repoint=20broken=20on=20Vista.=20=20=20=2024548:=20Fix=20for=20?=
 =?UTF-8?q?ALF-6110:Checking=20out=20do=D1=81ument's=20via=20MS=20Office?=
 =?UTF-8?q?=20leads=20to=20incorrect=20displaying=20of=20document's=20meta?=
 =?UTF-8?q?data=20and=20for=20ALF-6113:=20MP3=20files=20cause=20an=20error?=
 =?UTF-8?q?=20when=20viewing=20the=20Document=20Details=20page=20=20=20=20?=
 =?UTF-8?q?24601:=20Fix=20for=20ALF-6032:=20It's=20impossible=20to=20creat?=
 =?UTF-8?q?e=20meeting=20items?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@24879 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../org/alfresco/repo/webdav/LockMethod.java  | 31 +++----------------
 .../java/org/alfresco/repo/webdav/WebDAV.java |  4 ---
 2 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/source/java/org/alfresco/repo/webdav/LockMethod.java b/source/java/org/alfresco/repo/webdav/LockMethod.java
index 61b93c3fba..1022c82937 100644
--- a/source/java/org/alfresco/repo/webdav/LockMethod.java
+++ b/source/java/org/alfresco/repo/webdav/LockMethod.java
@@ -389,33 +389,14 @@ public class LockMethod extends WebDAVMethod
 
         xml.startDocument();
 
-        // Output the lock details
         String nsdec = generateNamespaceDeclarations(null);
+        xml.startElement(WebDAV.DAV_NS, WebDAV.XML_PROP + nsdec, WebDAV.XML_NS_PROP + nsdec, getDAVHelper().getNullAttributes());
 
-        if (WebDAV.AGENT_MS_6_1_7600.equals(m_userAgent))
-        {
-            xml.startElement(WebDAV.DAV_NS, WebDAV.XML_PROP + nsdec, WebDAV.XML_NS_PROP + nsdec, getDAVHelper().getNullAttributes());
+        // Output the lock details
+        generateLockDiscoveryXML(xml, lockNode, false, scope, WebDAV.getDepthName(m_depth), lt, owner);
 
-            // Output the lock details
-            generateLockDiscoveryXML(xml, lockNode, false, scope, WebDAV.getDepthName(m_depth), lt, owner);
-
-            // Close off the XML
-            xml.endElement(WebDAV.DAV_NS, WebDAV.XML_PROP, WebDAV.XML_NS_PROP);
-
-        }
-        else
-        {
-            xml.startElement(EMPTY_NS, WebDAV.XML_PROP + nsdec, WebDAV.XML_PROP + nsdec, getDAVHelper().getNullAttributes());
-
-            // Output the lock details
-            generateLockDiscoveryXML(xml, lockNode, true, scope, WebDAV.getDepthName(m_depth), lt, owner);
-
-            // Close off the XML
-            xml.endElement(EMPTY_NS, WebDAV.XML_PROP, WebDAV.XML_PROP);
-        }
-
-        // Send the XML back to the client
-        flushXML(xml);
+        // Close off the XML
+        xml.endElement(WebDAV.DAV_NS, WebDAV.XML_PROP, WebDAV.XML_NS_PROP);
     }
         
     /**
@@ -451,6 +432,4 @@ public class LockMethod extends WebDAVMethod
         
         return ns.toString();
     }
-
-    
 }
diff --git a/source/java/org/alfresco/repo/webdav/WebDAV.java b/source/java/org/alfresco/repo/webdav/WebDAV.java
index df49f8e50f..a688b89d13 100644
--- a/source/java/org/alfresco/repo/webdav/WebDAV.java
+++ b/source/java/org/alfresco/repo/webdav/WebDAV.java
@@ -123,10 +123,6 @@ public class WebDAV
     // If header keyword
     
     public static final String HEADER_KEY_NOT = "Not";
-
-    // User agents
-    
-    public static final  String AGENT_MS_6_1_7600 = "Microsoft-WebDAV-MiniRedir/6.1.7600";
     
     // General string constants