[zookeeper] branch branch-3.6 updated: ZOOKEEPER-3649: Add a line break in ls -s CLI

[an...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

andor pushed a commit to branch branch-3.6
in repository https://gitbox.apache.org/repos/asf/zookeeper.git


The following commit(s) were added to refs/heads/branch-3.6 by this push:
     new 901d82c  ZOOKEEPER-3649: Add a line break in ls -s CLI
901d82c is described below

commit 901d82c7fa2fe2ff9cc6a408ab0b8a490667def7
Author: ravowlga123 <ra...@gmail.com>
AuthorDate: Thu Jan 9 22:51:51 2020 +0100

    ZOOKEEPER-3649: Add a line break in ls -s CLI
    
    As per the ticket [ZOOKEEEPER-3649](https://issues.apache.org/jira/browse/ZOOKEEPER-3649) we need to add line break ls -s command.
    
    To achieve the desired behavior I have added new line character in option.add of  LsCommand.printChildren(). Please do let me know if made changes gives us the desired behavior or if anything else needs to be changed.
    
    Author: ravowlga123 <ra...@gmail.com>
    
    Reviewers: eolivelli@apache.org, andor@apache.org
    
    Closes #1183 from ravowlga123/ZOOKEEPER-3649 and squashes the following commits:
    
    f2e1997d6 [ravowlga123] ZOOKEEPER-3649 Removed additional new line from printChildren
    b36d63664 [ravowlga123] ZOOKEEPER-3649 Add a line break in ls -s CLI
    
    (cherry picked from commit 570285af427fd69471a682a071a47483f8f7ddf8)
    Signed-off-by: Andor Molnar <an...@apache.org>
---
 zookeeper-server/src/main/java/org/apache/zookeeper/cli/LsCommand.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/LsCommand.java b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/LsCommand.java
index a66821c..770a4a9 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/cli/LsCommand.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/cli/LsCommand.java
@@ -133,11 +133,10 @@ public class LsCommand extends CliCommand {
             }
             out.append(child);
         }
-        out.append("]");
+        out.append("]\n");
         if (stat != null) {
             new StatPrinter(out).print(stat);
         }
-        out.append("\n");
     }
 
 }