ZOOKEEPER-1139. jenkins is reporting two warnings, fix these (phunt via mahadev)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1152036 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -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)

src/java/main/org/apache/zookeeper/ClientWatchManager.java

@@ -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);
 }

src/java/main/org/apache/zookeeper/Op.java

@@ -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);