ozeigermann 2004/04/26 02:49:23
Modified: webdavclient/clientlib/src/java/org/apache/webdav/lib
WebdavResource.java
Log:
Applied patch by Thomas Bernert to address issue #28595
Revision Changes Path
1.14 +11 -3
jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/WebdavResource.java
Index: WebdavResource.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/WebdavResource.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- WebdavResource.java 14 Apr 2004 14:36:46 -0000 1.13
+++ WebdavResource.java 26 Apr 2004 09:49:23 -0000 1.14
@@ -4037,6 +4037,7 @@
// Get the lock for the given path.
WebdavState state = (WebdavState) client.getState();
// Discover the locktoken from the given lock owner
+
state = discoverLock(owner, path, state);
String lock = state.getLock(path);
if (lock == null) return false;
@@ -4088,8 +4089,15 @@
protected WebdavState discoverLock(String owner, String path,
WebdavState state) {
+ try {
+ if (lockDiscovery == null)
lockDiscovery=lockDiscoveryPropertyFindMethod(path);
+ } catch (Exception e) {
+ return state;
+ }
+
if (lockDiscovery == null) return state;
Lock[] activeLocks = lockDiscovery.getActiveLocks();
+
if (activeLocks == null) return state;
for (int i = 0; i < activeLocks.length; i++) {
String activeLockOwner = activeLocks[i].getOwner();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
