You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ra...@apache.org on 2013/09/25 05:22:58 UTC

git commit: CuratorEventType.SET_ACL didn't exist - wrong type was being set

Updated Branches:
  refs/heads/CURATOR-31 [created] 17bcca995


CuratorEventType.SET_ACL didn't exist - wrong type was being set


Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/17bcca99
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/17bcca99
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/17bcca99

Branch: refs/heads/CURATOR-31
Commit: 17bcca9952b86d0b436c03d969563bf57d01d9d5
Parents: f424f85
Author: randgalt <ra...@apache.org>
Authored: Tue Sep 24 20:23:22 2013 -0700
Committer: randgalt <ra...@apache.org>
Committed: Tue Sep 24 20:23:22 2013 -0700

----------------------------------------------------------------------
 .../java/org/apache/curator/framework/api/CuratorEventType.java | 5 +++++
 .../org/apache/curator/framework/imps/SetACLBuilderImpl.java    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/17bcca99/curator-framework/src/main/java/org/apache/curator/framework/api/CuratorEventType.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/main/java/org/apache/curator/framework/api/CuratorEventType.java b/curator-framework/src/main/java/org/apache/curator/framework/api/CuratorEventType.java
index a130864..684d11b 100644
--- a/curator-framework/src/main/java/org/apache/curator/framework/api/CuratorEventType.java
+++ b/curator-framework/src/main/java/org/apache/curator/framework/api/CuratorEventType.java
@@ -64,6 +64,11 @@ public enum CuratorEventType
     GET_ACL,
 
     /**
+     * Corresponds to {@link CuratorFramework#setACL()}
+     */
+    SET_ACL,
+
+    /**
      * Corresponds to {@link Watchable#usingWatcher(Watcher)} or {@link Watchable#watched()}
      */
     WATCHED,

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/17bcca99/curator-framework/src/main/java/org/apache/curator/framework/imps/SetACLBuilderImpl.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/main/java/org/apache/curator/framework/imps/SetACLBuilderImpl.java b/curator-framework/src/main/java/org/apache/curator/framework/imps/SetACLBuilderImpl.java
index 7a71d54..f7b2480 100644
--- a/curator-framework/src/main/java/org/apache/curator/framework/imps/SetACLBuilderImpl.java
+++ b/curator-framework/src/main/java/org/apache/curator/framework/imps/SetACLBuilderImpl.java
@@ -138,7 +138,7 @@ class SetACLBuilderImpl implements SetACLBuilder, BackgroundPathable<Stat>, Back
                 public void processResult(int rc, String path, Object ctx, Stat stat)
                 {
                     trace.commit();
-                    CuratorEvent event = new CuratorEventImpl(client, CuratorEventType.SET_DATA, rc, path, null, ctx, stat, null, null, null, null);
+                    CuratorEvent event = new CuratorEventImpl(client, CuratorEventType.SET_ACL, rc, path, null, ctx, stat, null, null, null, null);
                     client.processBackgroundOperation(operationAndData, event);
                 }
             },