Fix bug in TreeRpc where the "delete_all" field may be null.

Fixed TestTreeRpc delete definition unit test Signed-off-by: Chris Larsen <clarsen@euphoriaaudio.com>
OpenTSDB · Sep 26, 2013 · 4ad0659 · 4ad0659
1 parent 203679b
commit 4ad0659
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/tsd/TreeRpc.java b/src/tsd/TreeRpc.java
@@ -181,7 +181,7 @@ private void handleTree() {
           }
         } else {
           final String delete_all = query.getQueryStringParam("definition");
-          if (delete_all.toLowerCase().equals("true")) {
+          if (delete_all != null && delete_all.toLowerCase().equals("true")) {
             delete_definition = true;
           }
         }

diff --git a/test/tsd/TestTreeRpc.java b/test/tsd/TestTreeRpc.java
@@ -363,7 +363,7 @@ public void handleTreePOSTDeleteDefault() throws Exception {
   public void handleTreePOSTDeleteDefinition() throws Exception {
     setupStorage();
     HttpQuery query = NettyMocks.deleteQuery(tsdb, 
-      "/api/tree?definition=true", "{\"treeId\":1}");
+      "/api/tree", "{\"treeId\":1,\"definition\":true}");
     // make sure the root is there BEFORE we delete
     assertEquals(4, storage.numColumns(new byte[] { 0, 1 }));
     rpc.execute(tsdb, query);