luetzkendorf 2004/09/22 08:13:53
Modified: src/webdav/server/org/apache/slide/webdav/method
AbstractWebdavMethod.java
src/webdav/server/org/apache/slide/webdav
WebdavMethodFactory.java
Log:
merge with release branch
Revision Changes Path
1.49 +23 -14
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AbstractWebdavMethod.java
Index: AbstractWebdavMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AbstractWebdavMethod.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- AbstractWebdavMethod.java 17 Sep 2004 16:19:16 -0000 1.48
+++ AbstractWebdavMethod.java 22 Sep 2004 15:13:53 -0000 1.49
@@ -359,17 +359,23 @@
globalLockObtained = true;
}
- // clear expired lock-tokens
- UnlockListenerImpl listener = new UnlockListenerImpl(slideToken, token,
config, req, resp);
- lock.clearExpiredLocks(slideToken, requestUri, listener);
-
- if (listener.getUnlockCount() > 0) {
- // If we have have cleared any lock or any lock-null resource in
- // the prevois step we commit this changes, otherwise they will
- // be lost ifexecuteRequest() exits with an exception (e.g.
- // because of Not Found 404)
- token.commit();
- token.begin();
+ try {
+ // retrive to check it exists, otherwise it can't have locks
+ structure.retrieve(slideToken, requestUri);
+ // clear expired lock-tokens
+ UnlockListenerImpl listener = new UnlockListenerImpl(slideToken,
token, config, req, resp);
+ lock.clearExpiredLocks(slideToken, requestUri, listener);
+
+ if (listener.getUnlockCount() > 0) {
+ // If we have have cleared any lock or any lock-null resource
in
+ // the previous step we commit this changes, otherwise they
will
+ // be lost if executeRequest() exits with an exception (e.g.
+ // because of Not Found 404)
+ token.commit();
+ token.begin();
+ }
+ } catch (ObjectNotFoundException e) {
+ // ignore, it can't have locks
}
executeRequest();
@@ -1787,4 +1793,7 @@
return result;
}
}
+<<<<<<< AbstractWebdavMethod.java
}
+=======
+}>>>>>>> 1.43.2.7
1.7 +3 -11
jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavMethodFactory.java
Index: WebdavMethodFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavMethodFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- WebdavMethodFactory.java 28 Jul 2004 09:32:57 -0000 1.6
+++ WebdavMethodFactory.java 22 Sep 2004 15:13:53 -0000 1.7
@@ -34,15 +34,7 @@
// ----------------------------------------------------- Instance Variables
-
- /**
- * Configuration of the WebDAV servlet.
- */
- private WebdavServletConfig config;
-
-
// --------------------------------------------------------- Static Methods
-
/**
* Creates a new instance of a WebdavMethodFactory implementation.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
