Author: kwright
Date: Sun Nov 10 21:34:54 2013
New Revision: 1540555
URL: http://svn.apache.org/r1540555
Log:
Complete the basic implementation of zookeeper synchronization.
Modified:
manifoldcf/branches/CONNECTORS-13/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperConnection.java
Modified:
manifoldcf/branches/CONNECTORS-13/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperConnection.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-13/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperConnection.java?rev=1540555&r1=1540554&r2=1540555&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-13/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperConnection.java
(original)
+++
manifoldcf/branches/CONNECTORS-13/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/ZooKeeperConnection.java
Sun Nov 10 21:34:54 2013
@@ -240,9 +240,7 @@ public class ZooKeeperConnection
{
try
{
- List<ACL> aclList = new ArrayList<ACL>();
- // MHL
- zookeeper.create(resourcePath, data, aclList, CreateMode.PERSISTENT);
+ zookeeper.create(resourcePath, data, ZooDefs.Ids.OPEN_ACL_UNSAFE,
CreateMode.PERSISTENT);
}
catch (KeeperException e)
{
@@ -262,9 +260,7 @@ public class ZooKeeperConnection
{
try
{
- List<ACL> acls = new ArrayList<ACL>();
- // MHL
- zookeeper.create(flagPath, new byte[0], acls, CreateMode.PERSISTENT);
+ zookeeper.create(flagPath, new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE,
CreateMode.PERSISTENT);
}
catch (KeeperException e)
{
@@ -320,11 +316,9 @@ public class ZooKeeperConnection
protected String createSequentialChild(String mainNode, String childPrefix)
throws KeeperException, InterruptedException
{
- List<ACL> aclList = new ArrayList<ACL>();
- // MHL for the right ACL.
try
{
- zookeeper.create(mainNode, new byte[0], aclList, CreateMode.PERSISTENT);
+ zookeeper.create(mainNode, new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE,
CreateMode.PERSISTENT);
}
catch (KeeperException e)
{
@@ -332,7 +326,7 @@ public class ZooKeeperConnection
throw e;
}
- return zookeeper.create(mainNode + "/" + childPrefix, new byte[0],
aclList, CreateMode.EPHEMERAL_SEQUENTIAL);
+ return zookeeper.create(mainNode + "/" + childPrefix, new byte[0],
ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.EPHEMERAL_SEQUENTIAL);
}
/** Watcher class for zookeeper, so we get notified about zookeeper events.
*/
