wburrows 2004/12/07 17:50:37
Modified: webdavclient/clientlib/src/java/org/apache/webdav/lib
WebdavResource.java
Log:
Defect 32250: fixes to solve db deadlocks when client transaction used.
Revision Changes Path
1.34 +9 -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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- WebdavResource.java 8 Oct 2004 14:59:59 -0000 1.33
+++ WebdavResource.java 8 Dec 2004 01:50:37 -0000 1.34
@@ -4296,6 +4296,7 @@
method.setDepth(depth);
generateIfHeader(method);
+ generateTransactionHeader(method);
generateAdditionalHeaders(method);
int statusCode = client.executeMethod(method);
String lock = method.getLockToken();
@@ -4519,6 +4520,7 @@
method.setFollowRedirects(this.followRedirects);
generateIfHeader(method);
+ generateTransactionHeader(method);
method.setLockToken(lock);
generateAdditionalHeaders(method);
int statusCode = client.executeMethod(method);
@@ -5255,6 +5257,7 @@
method.setSubsciptionLifetime(lifetime);
method.setNotificationType(notificationType);
method.setNotificationDelay(notificationDelay);
+ generateTransactionHeader(method);
generateAdditionalHeaders(method);
int statusCode = client.executeMethod(method);
@@ -5288,6 +5291,7 @@
method.setFollowRedirects(this.followRedirects);
method.setSubscriptionId(subscriptionId);
+ generateTransactionHeader(method);
generateAdditionalHeaders(method);
int statusCode = client.executeMethod(method);
@@ -5326,6 +5330,7 @@
method.setFollowRedirects(this.followRedirects);
method.addSubscriptionId(subscriptionId);
+ generateTransactionHeader(method);
generateAdditionalHeaders(method);
int statusCode = client.executeMethod(method);
@@ -5364,6 +5369,7 @@
method.setFollowRedirects(this.followRedirects);
method.addSubscriptionId(subscriptionId);
+ generateTransactionHeader(method);
generateAdditionalHeaders(method);
int statusCode = client.executeMethod(method);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
