Author: kwright
Date: Tue Sep 16 21:31:40 2014
New Revision: 1625400
URL: http://svn.apache.org/r1625400
Log:
Get the order of cleanup of locknode right. Part of CONNECTORS-1031.
Modified:
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperConnection.java
Modified:
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperConnection.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperConnection.java?rev=1625400&r1=1625399&r2=1625400&view=diff
==============================================================================
---
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperConnection.java
(original)
+++
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperConnection.java
Tue Sep 16 21:31:40 2014
@@ -907,8 +907,8 @@ public class ZooKeeperConnection
if (e instanceof KeeperException.ConnectionLossException || e instanceof
KeeperException.SessionExpiredException)
{
// Close the handle, open a new one
- zookeeper.close();
lockNode = null;
+ zookeeper.close();
createSession();
}
else
@@ -931,8 +931,8 @@ public class ZooKeeperConnection
else if (e instanceof KeeperException.SessionExpiredException)
{
// Close the handle, open a new one
- zookeeper.close();
lockNode = null;
+ zookeeper.close();
createSession();
}
else
