From d6c75fbbb1d1f447fce7aa1df64ef8dc3cbdfcfc Mon Sep 17 00:00:00 2001
From: Thomas Graves <tgraves@apache.org>
Date: Mon, 20 Aug 2012 16:06:25 +0000
Subject: [PATCH] merge -r 1375082:1375083 from trunk. FIXES: YARN-27

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1375084 13f79535-47bb-0310-9956-ffa450edef68
---
 .../yarn/server/resourcemanager/scheduler/TestQueueMetrics.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestQueueMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestQueueMetrics.java
index 6ef2950ac36..e6140d9bafd 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestQueueMetrics.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestQueueMetrics.java
@@ -238,11 +238,11 @@ public class TestQueueMetrics {
   @Test 
   public void testMetricsCache() {
     MetricsSystem ms = new MetricsSystemImpl("cache");
+    ms.start();
     
     try {
       String p1 = "root1";
       String leafQueueName = "root1.leaf";
-      ms.start();
 
       QueueMetrics p1Metrics =
           QueueMetrics.forQueue(ms, p1, null, true, conf);