Return-Path: Delivered-To: apmail-hadoop-chukwa-commits-archive@minotaur.apache.org Received: (qmail 52443 invoked from network); 12 Jun 2009 04:27:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 12 Jun 2009 04:27:56 -0000 Received: (qmail 23446 invoked by uid 500); 12 Jun 2009 04:28:07 -0000 Delivered-To: apmail-hadoop-chukwa-commits-archive@hadoop.apache.org Received: (qmail 23436 invoked by uid 500); 12 Jun 2009 04:28:07 -0000 Mailing-List: contact chukwa-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: chukwa-dev@hadoop.apache.org Delivered-To: mailing list chukwa-commits@hadoop.apache.org Received: (qmail 23426 invoked by uid 99); 12 Jun 2009 04:28:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Jun 2009 04:28:07 +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; Fri, 12 Jun 2009 04:27:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AF4F12388882; Fri, 12 Jun 2009 04:27:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r783980 - in /hadoop/chukwa/trunk: CHANGES.txt src/java/org/apache/hadoop/chukwa/datacollection/collector/CollectorStub.java Date: Fri, 12 Jun 2009 04:27:36 -0000 To: chukwa-commits@hadoop.apache.org From: asrabkin@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090612042736.AF4F12388882@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: asrabkin Date: Fri Jun 12 04:27:36 2009 New Revision: 783980 URL: http://svn.apache.org/viewvc?rev=783980&view=rev Log: CHUKWA-287. Fix collector crash when no args. Contributed by Eric Yang. Modified: hadoop/chukwa/trunk/CHANGES.txt hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/collector/CollectorStub.java Modified: hadoop/chukwa/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/CHANGES.txt?rev=783980&r1=783979&r2=783980&view=diff ============================================================================== --- hadoop/chukwa/trunk/CHANGES.txt (original) +++ hadoop/chukwa/trunk/CHANGES.txt Fri Jun 12 04:27:36 2009 @@ -60,6 +60,8 @@ BUG FIXES + CHUKWA-287. Fix collector crash on startup when no args. (Eric Yang via asrabkin) + CHUKWA-273. Agents correctly use configured collector port numbers. (asrabkin) CHUKWA-216. postProcess.sh should use HADOOP_CONF_DIR to find hadoop-site.xml. (Jerome Boulon via asrabkin) Modified: hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/collector/CollectorStub.java URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/collector/CollectorStub.java?rev=783980&r1=783979&r2=783980&view=diff ============================================================================== --- hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/collector/CollectorStub.java (original) +++ hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/collector/CollectorStub.java Fri Jun 12 04:27:36 2009 @@ -38,7 +38,7 @@ DaemonWatcher.createInstance("Collector"); try { - if (args.length > 0 && args[0].equalsIgnoreCase("help")|| args[0].equalsIgnoreCase("-help")) { + if (args.length > 0 && (args[0].equalsIgnoreCase("help")|| args[0].equalsIgnoreCase("-help"))) { System.out.println("usage: Normally you should just invoke CollectorStub without arguments."); System.out.println("A number of options can be specified here for debugging or special uses. e.g.: "); System.out.println("Options include:\n\tportno=<#> \n\t" + "writer=pretend | "