You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/04/23 17:06:38 UTC
svn commit: r1470999 - in
/karaf/cellar/trunk/cloud/src/main/java/org/apache/karaf/cellar/cloud:
BlobStoreDiscoveryService.java BlobStoreDiscoveryServiceFactory.java
Author: jbonofre
Date: Tue Apr 23 15:06:38 2013
New Revision: 1470999
URL: http://svn.apache.org/r1470999
Log:
Code cleanup
Modified:
karaf/cellar/trunk/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java
karaf/cellar/trunk/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryServiceFactory.java
Modified: karaf/cellar/trunk/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java?rev=1470999&r1=1470998&r2=1470999&view=diff
==============================================================================
--- karaf/cellar/trunk/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java (original)
+++ karaf/cellar/trunk/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java Tue Apr 23 15:06:38 2013
@@ -139,7 +139,7 @@ public class BlobStoreDiscoveryService i
@Override
public void signIn() {
DateTime now = new DateTime();
- createBlob(container, ipAddress, new ServiceContainer(getHostAdress(), getIpAddress(), now));
+ createBlob(container, ipAddress, new ServiceContainer(getHostName(), getIpAddress(), now));
}
/**
@@ -148,7 +148,7 @@ public class BlobStoreDiscoveryService i
@Override
public void refresh() {
DateTime now = new DateTime();
- createBlob(container, ipAddress, new ServiceContainer(getHostAdress(), getIpAddress(), now));
+ createBlob(container, ipAddress, new ServiceContainer(getHostName(), getIpAddress(), now));
}
/**
@@ -272,7 +272,7 @@ public class BlobStoreDiscoveryService i
*
* @return the hostname of the local node.
*/
- protected String getHostAdress() {
+ protected String getHostName() {
try {
return InetAddress.getLocalHost().getHostName();
} catch (UnknownHostException ex) {
Modified: karaf/cellar/trunk/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryServiceFactory.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryServiceFactory.java?rev=1470999&r1=1470998&r2=1470999&view=diff
==============================================================================
--- karaf/cellar/trunk/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryServiceFactory.java (original)
+++ karaf/cellar/trunk/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryServiceFactory.java Tue Apr 23 15:06:38 2013
@@ -26,6 +26,9 @@ import java.util.Map;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
+/**
+ * A factory for blob store discovery service.
+ */
public class BlobStoreDiscoveryServiceFactory implements ManagedServiceFactory {
private static final transient Logger LOGGER = LoggerFactory.getLogger(BlobStoreDiscoveryServiceFactory.class);
@@ -40,11 +43,6 @@ public class BlobStoreDiscoveryServiceFa
private final BundleContext bundleContext;
- /**
- * Constructor
- *
- * @param bundleContext
- */
public BlobStoreDiscoveryServiceFactory(BundleContext bundleContext) {
this.bundleContext = bundleContext;
}
@@ -94,6 +92,7 @@ public class BlobStoreDiscoveryServiceFa
}
}
+ @Override
public void deleted(String pid) {
LOGGER.debug("CELLAR CLOUD: deleting blob store discovery service {}", pid);
ServiceRegistration oldRegistration = registrations.remove(pid);