remm 01/08/29 21:54:02
Modified: src/webdav/client/src/org/apache/webdav/lib WebdavState.java
src/webdav/client/src/org/apache/webdav/lib/methods
LockMethod.java
Log:
- Prevents lock tokens to be lost when trying to lock again a resource.
- The XML header was missing in a lock request.
- Patch submitted Robert Owen <eurrow at sas.com>
Revision Changes Path
1.3 +6 -3
jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/WebdavState.java
Index: WebdavState.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/WebdavState.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WebdavState.java 2001/07/22 19:26:54 1.2
+++ WebdavState.java 2001/08/30 04:54:02 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/WebdavState.java,v
1.2 2001/07/22 19:26:54 remm Exp $
- * $Revision: 1.2 $
- * $Date: 2001/07/22 19:26:54 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/WebdavState.java,v
1.3 2001/08/30 04:54:02 remm Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/08/30 04:54:02 $
*
* ====================================================================
*
@@ -109,6 +109,9 @@
* @param value Lock token value
*/
public void addLock(String uri, String value) {
+
+ if (value == null)
+ return;
if (lockTokens.contains(value))
return;
1.25 +4 -4
jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/LockMethod.java
Index: LockMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/LockMethod.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- LockMethod.java 2001/08/22 16:12:48 1.24
+++ LockMethod.java 2001/08/30 04:54:02 1.25
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/LockMethod.java,v
1.24 2001/08/22 16:12:48 juergen Exp $
- * $Revision: 1.24 $
- * $Date: 2001/08/22 16:12:48 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/LockMethod.java,v
1.25 2001/08/30 04:54:02 remm Exp $
+ * $Revision: 1.25 $
+ * $Date: 2001/08/30 04:54:02 $
*
* ====================================================================
*
@@ -475,7 +475,7 @@
owner.appendChild(text);
StringWriter stringWriter = new StringWriter();
- DOMWriter domWriter = new DOMWriter(stringWriter, true);
+ DOMWriter domWriter = new DOMWriter(stringWriter, false);
domWriter.print(document);
query = stringWriter.getBuffer().toString();
