Author: kwright
Date: Thu Jan 15 09:02:19 2015
New Revision: 1651984
URL: http://svn.apache.org/r1651984
Log:
Pull up fix for CONNECTORS-1145 from trunk
Modified:
manifoldcf/branches/release-2.0-branch/ (props changed)
manifoldcf/branches/release-2.0-branch/CHANGES.txt
manifoldcf/branches/release-2.0-branch/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/FileLockObject.java
Propchange: manifoldcf/branches/release-2.0-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 15 09:02:19 2015
@@ -119,4 +119,4 @@
/manifoldcf/branches/CONNECTORS-981:1605049-1605773
/manifoldcf/branches/CONNECTORS-989:1611600-1612101
/manifoldcf/branches/CONNECTORS-990:1610284-1610707
-/manifoldcf/trunk:1644252,1644399,1644538,1644920,1644931,1646317,1646397,1646403,1646640,1646947,1647574,1647577,1647608,1650351
+/manifoldcf/trunk:1644252,1644399,1644538,1644920,1644931,1646317,1646397,1646403,1646640,1646947,1647574,1647577,1647608,1650351,1651921
Modified: manifoldcf/branches/release-2.0-branch/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.0-branch/CHANGES.txt?rev=1651984&r1=1651983&r2=1651984&view=diff
==============================================================================
--- manifoldcf/branches/release-2.0-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-2.0-branch/CHANGES.txt Thu Jan 15 09:02:19 2015
@@ -4,6 +4,9 @@ $Id$
======================= Release 2.0.1 =====================
+CONNECTORS-1145: File locking hangs when saving output connection.
+(Andreas Baumann, Michael Wilken, Karl Wright)
+
CONNECTORS-1138: Loss of all metadata fields but one on pipeline
bifurcation.
(Salih Sen, Karl Wright)
Modified:
manifoldcf/branches/release-2.0-branch/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/FileLockObject.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.0-branch/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/FileLockObject.java?rev=1651984&r1=1651983&r2=1651984&view=diff
==============================================================================
---
manifoldcf/branches/release-2.0-branch/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/FileLockObject.java
(original)
+++
manifoldcf/branches/release-2.0-branch/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/FileLockObject.java
Thu Jan 15 09:02:19 2015
@@ -120,13 +120,14 @@ public class FileLockObject extends Lock
try
{
int status = readFile();
- if (status >= STATUS_WRITELOCKED)
+ if (status == STATUS_WRITELOCKED || status > 0)
{
throw new LockException(LOCKEDANOTHERJVM);
}
if (status == 0)
status = STATUS_WRITELOCKED;
- writeFile(status-1);
+ status--;
+ writeFile(status);
}
finally
{
