Return-Path: Delivered-To: apmail-hadoop-chukwa-commits-archive@minotaur.apache.org Received: (qmail 27690 invoked from network); 19 Jan 2010 20:02:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 19 Jan 2010 20:02:17 -0000 Received: (qmail 12597 invoked by uid 500); 19 Jan 2010 20:02:17 -0000 Delivered-To: apmail-hadoop-chukwa-commits-archive@hadoop.apache.org Received: (qmail 12578 invoked by uid 500); 19 Jan 2010 20:02:17 -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 12560 invoked by uid 99); 19 Jan 2010 20:02:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Jan 2010 20:02:17 +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, 19 Jan 2010 20:02:11 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 12EEF23888CD; Tue, 19 Jan 2010 20:01:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r900935 - /hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/adaptor/ExecAdaptor.java Date: Tue, 19 Jan 2010 20:01:51 -0000 To: chukwa-commits@hadoop.apache.org From: asrabkin@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100119200151.12EEF23888CD@eris.apache.org> Author: asrabkin Date: Tue Jan 19 20:01:50 2010 New Revision: 900935 URL: http://svn.apache.org/viewvc?rev=900935&view=rev Log: CHUKWA-420. Use default: in ExecAdaptor.shutdown() Modified: hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/adaptor/ExecAdaptor.java Modified: hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/adaptor/ExecAdaptor.java URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/adaptor/ExecAdaptor.java?rev=900935&r1=900934&r2=900935&view=diff ============================================================================== --- hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/adaptor/ExecAdaptor.java (original) +++ hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/adaptor/ExecAdaptor.java Tue Jan 19 20:01:50 2010 @@ -135,10 +135,6 @@ throws AdaptorException { log.info("Enter Shutdown:" + shutdownPolicy.name()+ " - ObjectId:" + this); switch(shutdownPolicy) { - case HARD_STOP : - timer.cancel(); - exec.stop(); - break; case GRACEFULLY : case WAIT_TILL_FINISHED : try { @@ -146,7 +142,11 @@ exec.waitFor(); } catch (InterruptedException e) { } - break; + break; + default: + timer.cancel(); + exec.stop(); + break; } log.info("Exist Shutdown:" + shutdownPolicy.name()+ " - ObjectId:" + this); return sendOffset;