svn commit: r1152036 - in /zookeeper/trunk: CHANGES.txt src/java/main/org/apache/zookeeper/ClientWatchManager.java src/java/main/org/apache/zookeeper/Op.java

[ma...@apache.org]

Author: mahadev
Date: Thu Jul 28 23:23:26 2011
New Revision: 1152036

URL: http://svn.apache.org/viewvc?rev=1152036&view=rev
Log:
ZOOKEEPER-1139. jenkins is reporting two warnings, fix these (phunt via mahadev)

Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientWatchManager.java
    zookeeper/trunk/src/java/main/org/apache/zookeeper/Op.java

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1152036&r1=1152035&r2=1152036&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Thu Jul 28 23:23:26 2011
@@ -270,6 +270,8 @@ BUGFIXES: 
 
   ZOOKEEPER-1138. release audit failing for a number of new files. (phunt via mahadev) 
 
+  ZOOKEEPER-1139. jenkins is reporting two warnings, fix these (phunt via mahadev)
+
 IMPROVEMENTS:
   ZOOKEEPER-724. Improve junit test integration - log harness information 
   (phunt via mahadev)

Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientWatchManager.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientWatchManager.java?rev=1152036&r1=1152035&r2=1152036&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientWatchManager.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientWatchManager.java Thu Jul 28 23:23:26 2011
@@ -33,7 +33,8 @@ public interface ClientWatchManager {
      * @param state event state
      * @param type event type
      * @param path event path
-     * @return
+     * @return may be empty set but must not be null
      */
-    public Set<Watcher> materialize(Watcher.Event.KeeperState state, Watcher.Event.EventType type, String path);
+    public Set<Watcher> materialize(Watcher.Event.KeeperState state,
+        Watcher.Event.EventType type, String path);
 }

Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/Op.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/Op.java?rev=1152036&r1=1152035&r2=1152036&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/Op.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/Op.java Thu Jul 28 23:23:26 2011
@@ -127,7 +127,6 @@ public abstract class Op {
      *                the path of the node
      * @param version
      *                the expected matching version
-     * @return
      */
     public static Op check(String path, int version) {
         return new Check(path, version);