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 5338417F8E for ; Sat, 3 Oct 2015 21:08:10 +0000 (UTC) Received: (qmail 18259 invoked by uid 500); 3 Oct 2015 21:08:10 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 18224 invoked by uid 500); 3 Oct 2015 21:08:10 -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 18207 invoked by uid 99); 3 Oct 2015 21:08:10 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Oct 2015 21:08:10 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id B8C7EC0C94 for ; Sat, 3 Oct 2015 21:08:09 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.794 X-Spam-Level: * X-Spam-Status: No, score=1.794 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.006] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id e1lp3IzKIe_I for ; Sat, 3 Oct 2015 21:08:08 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with ESMTP id BC69042B2F for ; Sat, 3 Oct 2015 21:08:07 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 53838E045B for ; Sat, 3 Oct 2015 21:08:07 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 5123F3A0444 for ; Sat, 3 Oct 2015 21:08:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1706632 - in /zookeeper/branches/branch-3.5: CHANGES.txt bin/zkEnv.cmd Date: Sat, 03 Oct 2015 21:08:07 -0000 To: commits@zookeeper.apache.org From: cnauroth@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20151003210807.5123F3A0444@svn01-us-west.apache.org> Author: cnauroth Date: Sat Oct 3 21:08:06 2015 New Revision: 1706632 URL: http://svn.apache.org/viewvc?rev=1706632&view=rev Log: ZOOKEEPER-2281: ZK Server startup fails if there are spaces in the JAVA_HOME path (Neha Bathra via cnauroth) Modified: zookeeper/branches/branch-3.5/CHANGES.txt zookeeper/branches/branch-3.5/bin/zkEnv.cmd Modified: zookeeper/branches/branch-3.5/CHANGES.txt URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1706632&r1=1706631&r2=1706632&view=diff ============================================================================== --- zookeeper/branches/branch-3.5/CHANGES.txt (original) +++ zookeeper/branches/branch-3.5/CHANGES.txt Sat Oct 3 21:08:06 2015 @@ -27,6 +27,9 @@ BUGFIXES: ZOOKEEPER-2268: Zookeeper doc creation fails on windows (Arshad Mohammad via cnauroth) + ZOOKEEPER-2281: ZK Server startup fails if there are spaces in the JAVA_HOME + path (Neha Bathra via cnauroth) + IMPROVEMENTS: ZOOKEEPER-2270: Allow MBeanRegistry to be overridden for better unit tests Modified: zookeeper/branches/branch-3.5/bin/zkEnv.cmd URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/bin/zkEnv.cmd?rev=1706632&r1=1706631&r2=1706632&view=diff ============================================================================== --- zookeeper/branches/branch-3.5/bin/zkEnv.cmd (original) +++ zookeeper/branches/branch-3.5/bin/zkEnv.cmd Sat Oct 3 21:08:06 2015 @@ -39,10 +39,12 @@ if not defined JAVA_HOME ( goto :eof ) -if not exist %JAVA_HOME%\bin\java.exe ( +set JAVA_HOME=%JAVA_HOME:"=% + +if not exist "%JAVA_HOME%"\bin\java.exe ( echo Error: JAVA_HOME is incorrectly set. goto :eof ) -set JAVA=%JAVA_HOME%\bin\java +set JAVA="%JAVA_HOME%"\bin\java