Return-Path: Delivered-To: apmail-hadoop-zookeeper-commits-archive@minotaur.apache.org Received: (qmail 92825 invoked from network); 23 Feb 2010 18:22:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 23 Feb 2010 18:22:56 -0000 Received: (qmail 54297 invoked by uid 500); 23 Feb 2010 18:22:56 -0000 Delivered-To: apmail-hadoop-zookeeper-commits-archive@hadoop.apache.org Received: (qmail 54243 invoked by uid 500); 23 Feb 2010 18:22:56 -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 54232 invoked by uid 99); 23 Feb 2010 18:22:55 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Feb 2010 18:22:55 +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; Tue, 23 Feb 2010 18:22:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5E9262388905; Tue, 23 Feb 2010 18:22:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r915466 - in /hadoop/zookeeper/trunk: CHANGES.txt src/java/main/org/apache/zookeeper/WatchedEvent.java Date: Tue, 23 Feb 2010 18:22:35 -0000 To: zookeeper-commits@hadoop.apache.org From: mahadev@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100223182235.5E9262388905@eris.apache.org> Author: mahadev Date: Tue Feb 23 18:22:34 2010 New Revision: 915466 URL: http://svn.apache.org/viewvc?rev=915466&view=rev Log: ZOOKEEPER-669. watchedevent tostring should clearly output the state/type/path (phunt via mahadev) Modified: hadoop/zookeeper/trunk/CHANGES.txt hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/WatchedEvent.java Modified: hadoop/zookeeper/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=915466&r1=915465&r2=915466&view=diff ============================================================================== --- hadoop/zookeeper/trunk/CHANGES.txt (original) +++ hadoop/zookeeper/trunk/CHANGES.txt Tue Feb 23 18:22:34 2010 @@ -231,6 +231,9 @@ ZOOKEEPER-569. Failure of elected leader can lead to never-ending leader election (henry via flavio) + ZOOKEEPER-669. watchedevent tostring should clearly output the + state/type/path (phunt via mahadev) + IMPROVEMENTS: ZOOKEEPER-473. cleanup junit tests to eliminate false positives due to "socket reuse" and failure to close client (phunt via mahadev) Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/WatchedEvent.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/WatchedEvent.java?rev=915466&r1=915465&r2=915466&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/WatchedEvent.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/WatchedEvent.java Tue Feb 23 18:22:34 2010 @@ -64,10 +64,8 @@ @Override public String toString() { - if(path == null) // then is a state change - return "WatchedEvent: Server state change. New state: " + keeperState; - else // is a znode change - return "WatchedEvent: Znode change. Path: " + path + " Type: " + eventType; + return "WatchedEvent state:" + keeperState + + " type:" + eventType + " path:" + path; } /**