Author: kwright
Date: Tue Sep 16 21:33:15 2014
New Revision: 1625402
URL: http://svn.apache.org/r1625402
Log:
Pull up another CONNECTORS-1031 -related fix from trunk.
Modified:
manifoldcf/branches/dev_1x/ (props changed)
manifoldcf/branches/dev_1x/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperConnection.java
Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1625400
Modified:
manifoldcf/branches/dev_1x/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperConnection.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperConnection.java?rev=1625402&r1=1625401&r2=1625402&view=diff
==============================================================================
---
manifoldcf/branches/dev_1x/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperConnection.java
(original)
+++
manifoldcf/branches/dev_1x/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperConnection.java
Tue Sep 16 21:33:15 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
