svn merge -c 1437775 FIXES: YARN-354. WebAppProxyServer exits immediately after startup. Contributed by Lian Xie

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1437776 13f79535-47bb-0310-9956-ffa450edef68

hadoop-yarn-project/CHANGES.txt

@@ -314,6 +314,9 @@ Release 0.23.6 - UNRELEASED
 
     YARN-334. Maven RAT plugin is not checking all source files (tgraves)
 
+    YARN-354. WebAppProxyServer exits immediately after startup (Liang Xie via
+    jlowe)
+
 Release 0.23.5 - 2012-11-28
 
   INCOMPATIBLE CHANGES

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxy.java

@@ -114,4 +114,13 @@ public void stop() {
     }
     super.stop();
   }
+
+  public void join() {
+    if(proxyServer != null) {
+      try {
+        proxyServer.join();
+      } catch (InterruptedException e) {
+      }
+    }
+  }
 }

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServer.java

@@ -73,6 +73,14 @@ protected void doSecureLogin(Configuration conf) throws IOException {
         YarnConfiguration.PROXY_PRINCIPAL);
   }
 
+  /**
+   * Wait for service to finish.
+   * (Normally, it runs forever.)
+   */
+  private void join() {
+    proxy.join();
+  }
+
   public static void main(String[] args) {
     Thread.setDefaultUncaughtExceptionHandler(new YarnUncaughtExceptionHandler());
     StringUtils.startupShutdownMessage(WebAppProxyServer.class, args, LOG);
@@ -84,6 +92,7 @@ public static void main(String[] args) {
       YarnConfiguration conf = new YarnConfiguration();
       proxy.init(conf);
       proxy.start();
+      proxy.join();
     } catch (Throwable t) {
       LOG.fatal("Error starting Proxy server", t);
       System.exit(-1);