You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sa...@apache.org on 2013/08/31 04:16:49 UTC
svn commit: r1519131 - in
/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common:
CHANGES.txt src/main/java/org/apache/hadoop/service/CompositeService.java
Author: sandy
Date: Sat Aug 31 02:16:48 2013
New Revision: 1519131
URL: http://svn.apache.org/r1519131
Log:
HADOOP-9918. Add addIfService to CompositeService (Karthik Kambatla via Sandy Ryza)
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/CompositeService.java
Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1519131&r1=1519130&r2=1519131&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt Sat Aug 31 02:16:48 2013
@@ -45,6 +45,9 @@ Release 2.1.1-beta - UNRELEASED
HADOOP-9906. Move HAZKUtil to o.a.h.util.ZKUtil and make inner-classes
public (Karthik Kambatla via Sandy Ryza)
+ HADOOP-9918. Add addIfService to CompositeService (Karthik Kambatla via
+ Sandy Ryza)
+
OPTIMIZATIONS
BUG FIXES
Modified: hadoop/common/branches/branch-2.1-beta/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.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/CompositeService.java?rev=1519131&r1=1519130&r2=1519131&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/CompositeService.java (original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/CompositeService.java Sat Aug 31 02:16:48 2013
@@ -64,6 +64,11 @@ public class CompositeService extends Ab
}
}
+ /**
+ * Add the passed {@link Service} to the list of services managed by this
+ * {@link CompositeService}
+ * @param service the {@link Service} to be added
+ */
protected void addService(Service service) {
if (LOG.isDebugEnabled()) {
LOG.debug("Adding service " + service.getName());
@@ -73,6 +78,21 @@ public class CompositeService extends Ab
}
}
+ /**
+ * If the passed object is an instance of {@link Service},
+ * add it to the list of services managed by this {@link CompositeService}
+ * @param object
+ * @return true if a service is added, false otherwise.
+ */
+ protected boolean addIfService(Object object) {
+ if (object instanceof Service) {
+ addService((Service) object);
+ return true;
+ } else {
+ return false;
+ }
+ }
+
protected synchronized boolean removeService(Service service) {
synchronized (serviceList) {
return serviceList.add(service);