svn commit: r907830 - in /hadoop/zookeeper/trunk: CHANGES.txt src/c/include/zookeeper.h src/java/main/org/apache/zookeeper/ZooKeeper.java

[ma...@apache.org]

Author: mahadev
Date: Mon Feb  8 22:36:39 2010
New Revision: 907830

URL: http://svn.apache.org/viewvc?rev=907830&view=rev
Log:
ZOOKEEPER-489. When create a znode, a NULL ACL parameter cannot be accepted. (breed via mahadev)

Modified:
    hadoop/zookeeper/trunk/CHANGES.txt
    hadoop/zookeeper/trunk/src/c/include/zookeeper.h
    hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeper.java

Modified: hadoop/zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=907830&r1=907829&r2=907830&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/CHANGES.txt (original)
+++ hadoop/zookeeper/trunk/CHANGES.txt Mon Feb  8 22:36:39 2010
@@ -215,6 +215,9 @@
   ZOOKEEPER-495. c client logs an invalid error when zookeeper_init is called
   with chroot (phunt via mahadev)
 
+  ZOOKEEPER-489. When create a znode, a NULL ACL parameter cannot be accepted.
+  (breed via mahadev)
+
 IMPROVEMENTS:
   ZOOKEEPER-473. cleanup junit tests to eliminate false positives due to
   "socket reuse" and failure to close client (phunt via mahadev)

Modified: hadoop/zookeeper/trunk/src/c/include/zookeeper.h
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/c/include/zookeeper.h?rev=907830&r1=907829&r2=907830&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/c/include/zookeeper.h (original)
+++ hadoop/zookeeper/trunk/src/c/include/zookeeper.h Mon Feb  8 22:36:39 2010
@@ -600,8 +600,7 @@
  * separating ancestors of the node.
  * \param value The data to be stored in the node.
  * \param valuelen The number of bytes in data.
- * \param acl The initial ACL of the node. If null, the ACL of the parent will be
- *    used.
+ * \param acl The initial ACL of the node. The ACL must not be null or empty.
  * \param flags this parameter can be set to 0 for normal create or an OR
  *    of the Create Flags
  * \param completion the routine to invoke when the request completes. The completion
@@ -1055,9 +1054,8 @@
  * separating ancestors of the node.
  * \param value The data to be stored in the node.
  * \param valuelen The number of bytes in data. To set the data to be NULL use
-  * value as NULL and valuelen as -1.
- * \param acl The initial ACL of the node. If null, the ACL of the parent will be
- *    used.
+ * value as NULL and valuelen as -1.
+ * \param acl The initial ACL of the node. The ACL must not be null or empty.
  * \param flags this parameter can be set to 0 for normal create or an OR
  *    of the Create Flags
  * \param path_buffer Buffer which will be filled with the path of the

Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeper.java
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeper.java?rev=907830&r1=907829&r2=907830&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeper.java (original)
+++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeper.java Mon Feb  8 22:36:39 2010
@@ -608,7 +608,7 @@
      *                and/or sequential
      * @return the actual path of the created node
      * @throws KeeperException if the server returns a non-zero error code
-     * @throws KeeperException.InvalidACLException if the ACL is invalid
+     * @throws KeeperException.InvalidACLException if the ACL is invalid, null, or empty
      * @throws InterruptedException if the transaction is interrupted
      * @throws IllegalArgumentException if an invalid path is specified
      */