svn commit: r1591073 - /hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/CompositeService.java

[vinodkv]

Author: vinodkv
Date: Tue Apr 29 19:50:44 2014
New Revision: 1591073

URL: http://svn.apache.org/r1591073
Log:
YARN-1929. Fixed a deadlock in ResourceManager that occurs when failover 
happens right at the time of shutdown. Contributed by Karthik Kambatla.
svn merge --ignore-ancestry -c 1591071 ../../trunk/

Modified:
    
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/CompositeService.java

Modified: 
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/CompositeService.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/CompositeService.java?rev=1591073&r1=1591072&r2=1591073&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/CompositeService.java
 (original)
+++ 
hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/CompositeService.java
 Tue Apr 29 19:50:44 2014
@@ -141,8 +141,7 @@ public class CompositeService extends Ab
    * @throws RuntimeException the first exception raised during the
    * stop process -<i>after all services are stopped</i>
    */
-  private synchronized void stop(int numOfServicesStarted,
-                                 boolean stopOnlyStartedServices) {
+  private void stop(int numOfServicesStarted, boolean stopOnlyStartedServices) 
{
     // stop in reverse order of start
     Exception firstException = null;
     List<Service> services = getServices();