Return-Path: X-Original-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 539EC9877 for ; Mon, 19 Sep 2011 22:54:11 +0000 (UTC) Received: (qmail 98818 invoked by uid 500); 19 Sep 2011 22:54:11 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 98780 invoked by uid 500); 19 Sep 2011 22:54:11 -0000 Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mapreduce-dev@hadoop.apache.org Delivered-To: mailing list mapreduce-commits@hadoop.apache.org Received: (qmail 98772 invoked by uid 99); 19 Sep 2011 22:54:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Sep 2011 22:54:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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, 19 Sep 2011 22:54:08 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 53A05238888F; Mon, 19 Sep 2011 22:53:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1172879 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: CHANGES.txt hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/Router.java Date: Mon, 19 Sep 2011 22:53:47 -0000 To: mapreduce-commits@hadoop.apache.org From: mahadev@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20110919225347.53A05238888F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mahadev Date: Mon Sep 19 22:53:46 2011 New Revision: 1172879 URL: http://svn.apache.org/viewvc?rev=1172879&view=rev Log: MAPREDUCE-3038. job history server not starting because conf() missing HsController (Jeffrey Naisbitt via mahadev) - merging r1172875 from trunk Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/Router.java Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1172879&r1=1172878&r2=1172879&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Mon Sep 19 22:53:46 2011 @@ -1325,6 +1325,9 @@ Release 0.23.0 - Unreleased MAPREDUCE-3042. Fixed default ResourceTracker address. (Chris Riccomini via acmurthy) + MAPREDUCE-3038. job history server not starting because conf() missing + HsController (Jeffrey Naisbitt via mahadev) + Release 0.22.0 - Unreleased INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/Router.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/Router.java?rev=1172879&r1=1172878&r2=1172879&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/Router.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/Router.java Mon Sep 19 22:53:46 2011 @@ -25,6 +25,8 @@ import com.google.common.collect.Maps; import java.lang.reflect.Method; import java.lang.reflect.Modifier; +import java.lang.NoSuchMethodException; +import java.lang.SecurityException; import java.util.EnumSet; import java.util.List; import java.util.Map; @@ -88,23 +90,28 @@ class Router { private Dest addController(WebApp.HTTP httpMethod, String path, Class cls, String action, List names) { - for (Method method : cls.getDeclaredMethods()) { - if (method.getName().equals(action) && - method.getParameterTypes().length == 0 && - Modifier.isPublic(method.getModifiers())) { - // TODO: deal with parameters using the names - Dest dest = routes.get(path); - if (dest == null) { - method.setAccessible(true); // avoid any runtime checks - dest = new Dest(path, method, cls, names, httpMethod); - routes.put(path, dest); - return dest; - } - dest.methods.add(httpMethod); + try { + // Look for the method in all public methods declared in the class + // or inherited by the class. + // Note: this does not distinguish methods with the same signature + // but different return types. + // TODO: We may want to deal with methods that take parameters in the future + Method method = cls.getMethod(action, null); + Dest dest = routes.get(path); + if (dest == null) { + method.setAccessible(true); // avoid any runtime checks + dest = new Dest(path, method, cls, names, httpMethod); + routes.put(path, dest); return dest; } + dest.methods.add(httpMethod); + return dest; + } catch (NoSuchMethodException nsme) { + throw new WebAppException(action + "() not found in " + cls); + } catch (SecurityException se) { + throw new WebAppException("Security exception thrown for " + action + + "() in " + cls); } - throw new WebAppException(action + "() not found in " + cls); } private void addDefaultView(Dest dest) {