Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-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 78F39796A for ; Fri, 9 Dec 2011 08:50:38 +0000 (UTC) Received: (qmail 25373 invoked by uid 500); 9 Dec 2011 08:50:37 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 25293 invoked by uid 500); 9 Dec 2011 08:50:37 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 25285 invoked by uid 99); 9 Dec 2011 08:50:34 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Dec 2011 08:50:34 +0000 X-ASF-Spam-Status: No, hits=-1998.0 required=5.0 tests=ALL_TRUSTED,FB_GET_MEDS 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, 09 Dec 2011 08:50:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A479B2388860; Fri, 9 Dec 2011 08:50:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1212282 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/conf/Configuration.java src/test/java/org/apache/hadoop/conf/TestConfiguration.java Date: Fri, 09 Dec 2011 08:50:09 -0000 To: common-commits@hadoop.apache.org From: amarrk@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111209085009.A479B2388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: amarrk Date: Fri Dec 9 08:50:09 2011 New Revision: 1212282 URL: http://svn.apache.org/viewvc?rev=1212282&view=rev Log: HADOOP-7851. Configuration.getClasses() never returns the default value. (amarrk) Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1212282&r1=1212281&r2=1212282&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Fri Dec 9 08:50:09 2011 @@ -75,6 +75,8 @@ Trunk (unreleased changes) HADOOP-7886. Add toString to FileStatus. (SreeHari via jghoman) BUGS + HADOOP-7851. Configuration.getClasses() never returns the default value. + (amarrk) HADOOP-7606. Upgrade Jackson to version 1.7.1 to match the version required by Jersey (Alejandro Abdelnur via atm) Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java?rev=1212282&r1=1212281&r2=1212282&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java Fri Dec 9 08:50:09 2011 @@ -1145,9 +1145,11 @@ public class Configuration implements It * or defaultValue. */ public Class[] getClasses(String name, Class ... defaultValue) { - String[] classnames = getTrimmedStrings(name); - if (classnames == null) + String valueString = getRaw(name); + if (null == valueString) { return defaultValue; + } + String[] classnames = getTrimmedStrings(name); try { Class[] classes = new Class[classnames.length]; for(int i = 0; i < classnames.length; i++) { Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java?rev=1212282&r1=1212281&r2=1212282&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java Fri Dec 9 08:50:09 2011 @@ -837,6 +837,27 @@ public class TestConfiguration extends T assertTrue("Picked out wrong key " + key4, !res.containsKey(key4)); } + public void testGetClassesShouldReturnDefaultValue() throws Exception { + Configuration config = new Configuration(); + Class[] classes = + config.getClasses("testClassName", Configuration.class); + assertEquals( + "Not returning expected number of classes. Number of returned classes =" + + classes.length, 1, classes.length); + assertEquals("Not returning the default class Name", Configuration.class, + classes[0]); + } + + public void testGetClassesShouldReturnEmptyArray() + throws Exception { + Configuration config = new Configuration(); + config.set("testClassName", ""); + Class[] classes = config.getClasses("testClassName", Configuration.class); + assertEquals( + "Not returning expected number of classes. Number of returned classes =" + + classes.length, 0, classes.length); + } + public static void main(String[] argv) throws Exception { junit.textui.TestRunner.main(new String[]{ TestConfiguration.class.getName()