Author: breed
Date: Wed May 20 17:58:56 2009
New Revision: 776788

URL: http://svn.apache.org/viewvc?rev=776788&view=rev
Log:
ZOOKEEPER-405 nullpointer exception in zookeeper java shell.

Modified:
    hadoop/zookeeper/trunk/CHANGES.txt
    hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeperMain.java

Modified: hadoop/zookeeper/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=776788&r1=776787&r2=776788&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/CHANGES.txt (original)
+++ hadoop/zookeeper/trunk/CHANGES.txt Wed May 20 17:58:56 2009
@@ -74,6 +74,8 @@
 
   ZOOKEEPER-400. Issues with procedure to close ledger. (flavio)
 
+  ZOOKEEPER-405. nullpointer exception in zookeeper java shell. (mahadev via 
breed)
+
 IMPROVEMENTS:
   ZOOKEEPER-308. improve the atomic broadcast performance 3x.
   (breed via mahadev)

Modified: 
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeperMain.java
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeperMain.java?rev=776788&r1=776787&r2=776788&view=diff
==============================================================================
--- 
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeperMain.java 
(original)
+++ 
hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeperMain.java 
Wed May 20 17:58:56 2009
@@ -613,6 +613,7 @@
         } else if (cmd.equals("get") && args.length >= 2) {
             path = args[1];
             byte data[] = zk.getData(path, watch, stat);
+            data = (data == null)? "null".getBytes() : data;
             System.out.println(new String(data));
             printStat(stat);
         } else if (cmd.equals("ls") && args.length >= 2) {


Reply via email to