pnever 2003/09/08 06:42:10
Modified: src/webdav/server/org/apache/slide/webdav/util
PropertyHelper.java
Log:
computeLockDiscovery did not take NON-lock-inheritance properly into account
Revision Changes Path
1.51 +11 -6
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java
Index: PropertyHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- PropertyHelper.java 1 Sep 2003 16:51:35 -0000 1.50
+++ PropertyHelper.java 8 Sep 2003 13:42:10 -0000 1.51
@@ -1294,9 +1294,13 @@
while (lockTokens.hasMoreElements()) {
objectLockToken = (NodeLock) lockTokens.nextElement();
- Element activelock = createActiveLockElement(objectLockToken,serverURL,
contextPath);
- if (activelock != null) {
- xmlValue.add(activelock);
+ if (revisionDescriptors.getUri().equals(objectLockToken.getObjectUri())
||
+ objectLockToken.isInheritable()
+ ) {
+ Element activelock =
createActiveLockElement(objectLockToken,serverURL, contextPath);
+ if (activelock != null) {
+ xmlValue.add(activelock);
+ }
}
}
@@ -2374,6 +2378,7 @@
}
}
+
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
