From commits-return-3733-apmail-zookeeper-commits-archive=zookeeper.apache.org@zookeeper.apache.org Thu Apr 3 22:40:51 2014 Return-Path: X-Original-To: apmail-zookeeper-commits-archive@www.apache.org Delivered-To: apmail-zookeeper-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 547DF11715 for ; Thu, 3 Apr 2014 22:40:51 +0000 (UTC) Received: (qmail 85007 invoked by uid 500); 3 Apr 2014 22:40:50 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 84951 invoked by uid 500); 3 Apr 2014 22:40:50 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 84942 invoked by uid 99); 3 Apr 2014 22:40:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Apr 2014 22:40:49 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Apr 2014 22:40:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A926423888D7; Thu, 3 Apr 2014 22:40:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1584440 - in /zookeeper/branches/branch-3.4: CHANGES.txt src/java/main/org/apache/zookeeper/ZooKeeperMain.java Date: Thu, 03 Apr 2014 22:40:28 -0000 To: commits@zookeeper.apache.org From: michim@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140403224028.A926423888D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: michim Date: Thu Apr 3 22:40:28 2014 New Revision: 1584440 URL: http://svn.apache.org/r1584440 Log: ZOOKEEPER-1897. ZK Shell/Cli not processing commands (stack via michim) Modified: zookeeper/branches/branch-3.4/CHANGES.txt zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/ZooKeeperMain.java Modified: zookeeper/branches/branch-3.4/CHANGES.txt URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1584440&r1=1584439&r2=1584440&view=diff ============================================================================== --- zookeeper/branches/branch-3.4/CHANGES.txt (original) +++ zookeeper/branches/branch-3.4/CHANGES.txt Thu Apr 3 22:40:28 2014 @@ -14,6 +14,8 @@ BUGFIXES: ZOOKEEPER-1906. zkpython: invalid data in GetData for empty node (Nikita Vetoshkin via michim) + ZOOKEEPER-1897. ZK Shell/Cli not processing commands (stack via michim) + Release 3.4.6 - 2014-03-10 Modified: zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/ZooKeeperMain.java URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/ZooKeeperMain.java?rev=1584440&r1=1584439&r2=1584440&view=diff ============================================================================== --- zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/ZooKeeperMain.java (original) +++ zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/ZooKeeperMain.java Thu Apr 3 22:40:28 2014 @@ -349,6 +349,9 @@ public class ZooKeeperMain { executeLine(line); } } + } else { + // Command line args non-null. Run what was passed. + processCmd(cl); } }