luetzkendorf 2004/09/12 10:33:56
Modified: src/webdav/server/org/apache/slide/webdav/method Tag:
SLIDE_2_1_RELEASE_BRANCH AbstractWebdavMethod.java
Log:
fix for non released global lock with LOCK that starts a external transaction
Revision Changes Path
No revision
No revision
1.43.2.5 +4 -8
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.43.2.4
retrieving revision 1.43.2.5
diff -u -r1.43.2.4 -r1.43.2.5
--- AbstractWebdavMethod.java 12 Sep 2004 17:27:41 -0000 1.43.2.4
+++ AbstractWebdavMethod.java 12 Sep 2004 17:33:56 -0000 1.43.2.5
@@ -324,6 +324,7 @@
parseRequestHeaders();
boolean transactionIsStarted = false;
+ boolean globalLockObtained = false;
String txId = null;
try {
parseRequest();
@@ -356,6 +357,7 @@
} else if (this instanceof WriteMethod) {
assureGlobalWriteLock();
}
+ globalLockObtained = true;
}
// clear expired lock-tokens
@@ -425,7 +427,7 @@
e.printStackTrace();
}
}
- else {
+ if (globalLockObtained) {
releaseGlobalLock();
}
}
@@ -1799,10 +1801,4 @@
return result;
}
}
-}
-
-
-
-
-
-
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
