Return-Path: Delivered-To: apmail-hadoop-zookeeper-commits-archive@minotaur.apache.org Received: (qmail 90010 invoked from network); 26 Apr 2010 20:02:03 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 26 Apr 2010 20:02:03 -0000 Received: (qmail 38964 invoked by uid 500); 26 Apr 2010 20:02:03 -0000 Delivered-To: apmail-hadoop-zookeeper-commits-archive@hadoop.apache.org Received: (qmail 38918 invoked by uid 500); 26 Apr 2010 20:02:03 -0000 Mailing-List: contact zookeeper-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: zookeeper-dev@ Delivered-To: mailing list zookeeper-commits@hadoop.apache.org Received: (qmail 38910 invoked by uid 99); 26 Apr 2010 20:02:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Apr 2010 20:02:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Mon, 26 Apr 2010 20:02:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 77C0723889B6; Mon, 26 Apr 2010 20:01:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r938214 - in /hadoop/zookeeper/branches/branch-3.3: CHANGES.txt src/java/test/org/apache/zookeeper/server/ZooKeeperServerMainTest.java src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java Date: Mon, 26 Apr 2010 20:01:15 -0000 To: zookeeper-commits@hadoop.apache.org From: phunt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100426200115.77C0723889B6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: phunt Date: Mon Apr 26 20:01:15 2010 New Revision: 938214 URL: http://svn.apache.org/viewvc?rev=938214&view=rev Log: ZOOKEEPER-734. QuorumPeerTestBase.java and ZooKeeperServerMainTest.java do not handle windows path correctly Modified: hadoop/zookeeper/branches/branch-3.3/CHANGES.txt hadoop/zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/server/ZooKeeperServerMainTest.java hadoop/zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java Modified: hadoop/zookeeper/branches/branch-3.3/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.3/CHANGES.txt?rev=938214&r1=938213&r2=938214&view=diff ============================================================================== --- hadoop/zookeeper/branches/branch-3.3/CHANGES.txt (original) +++ hadoop/zookeeper/branches/branch-3.3/CHANGES.txt Mon Apr 26 20:01:15 2010 @@ -21,6 +21,9 @@ BUGFIXES: ZOOKEEPER-738. zookeeper.jute.h fails to compile with -pedantic (Jozef Hatala via phunt) + ZOOKEEPER-734. QuorumPeerTestBase.java and ZooKeeperServerMainTest.java + do not handle windows path correctly (Vishal K via phunt) + Release 3.3.0 - 2010-03-24 Non-backward compatible changes: Modified: hadoop/zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/server/ZooKeeperServerMainTest.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/server/ZooKeeperServerMainTest.java?rev=938214&r1=938213&r2=938214&view=diff ============================================================================== --- hadoop/zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/server/ZooKeeperServerMainTest.java (original) +++ hadoop/zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/server/ZooKeeperServerMainTest.java Mon Apr 26 20:01:15 2010 @@ -61,8 +61,15 @@ public class ZooKeeperServerMainTest ext if (!dataDir.mkdir()) { throw new IOException("unable to mkdir " + dataDir); } - fwriter.write("dataDir=" + dataDir.toString() + "\n"); - + + // Convert windows path to UNIX to avoid problems with "\" + String dir = dataDir.toString(); + String osname = java.lang.System.getProperty("os.name"); + if (osname.toLowerCase().contains("windows")) { + dir = dir.replace('\\', '/'); + } + fwriter.write("dataDir=" + dir + "\n"); + fwriter.write("clientPort=" + clientPort + "\n"); fwriter.flush(); fwriter.close(); Modified: hadoop/zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java?rev=938214&r1=938213&r2=938214&view=diff ============================================================================== --- hadoop/zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java (original) +++ hadoop/zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java Mon Apr 26 20:01:15 2010 @@ -73,8 +73,15 @@ public class QuorumPeerTestBase extends if (!dataDir.mkdir()) { throw new IOException("Unable to mkdir " + dataDir); } - fwriter.write("dataDir=" + dataDir.toString() + "\n"); + // Convert windows path to UNIX to avoid problems with "\" + String dir = dataDir.toString(); + String osname = java.lang.System.getProperty("os.name"); + if (osname.toLowerCase().contains("windows")) { + dir = dir.replace('\\', '/'); + } + fwriter.write("dataDir=" + dir + "\n"); + fwriter.write("clientPort=" + clientPort + "\n"); fwriter.write(quorumCfgSection + "\n"); fwriter.flush();