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 2015/03/20 14:32:09 UTC
karaf-cellar git commit: [KARAF-3609] Discovery service factories
register the services in the finally statement
Repository: karaf-cellar
Updated Branches:
refs/heads/cellar-3.0.x 185fb64f7 -> ab61ea403
[KARAF-3609] Discovery service factories register the services in the finally statement
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/ab61ea40
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/ab61ea40
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/ab61ea40
Branch: refs/heads/cellar-3.0.x
Commit: ab61ea403ef6668211a41adb14466f8b0e377694
Parents: 185fb64
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Mar 20 14:31:47 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Mar 20 14:31:47 2015 +0100
----------------------------------------------------------------------
.../apache/karaf/cellar/cloud/BlobStoreDiscoveryServiceFactory.java | 1 -
.../karaf/cellar/kubernetes/KubernetesDiscoveryServiceFactory.java | 1 -
2 files changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ab61ea40/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryServiceFactory.java
----------------------------------------------------------------------
diff --git a/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryServiceFactory.java b/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryServiceFactory.java
index 7341822..3dc994f 100644
--- a/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryServiceFactory.java
+++ b/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryServiceFactory.java
@@ -82,7 +82,6 @@ public class BlobStoreDiscoveryServiceFactory implements ManagedServiceFactory {
service.init();
newRegistration = bundleContext.registerService(DiscoveryService.class.getName(), service, (Dictionary) serviceProperties);
- registrations.put(pid, newRegistration);
}
} finally {
ServiceRegistration oldRegistration = (newRegistration == null) ? registrations.remove(pid) : registrations.put(pid, newRegistration);
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ab61ea40/kubernetes/src/main/java/org/apache/karaf/cellar/kubernetes/KubernetesDiscoveryServiceFactory.java
----------------------------------------------------------------------
diff --git a/kubernetes/src/main/java/org/apache/karaf/cellar/kubernetes/KubernetesDiscoveryServiceFactory.java b/kubernetes/src/main/java/org/apache/karaf/cellar/kubernetes/KubernetesDiscoveryServiceFactory.java
index 57a79fc..f41c3ef 100644
--- a/kubernetes/src/main/java/org/apache/karaf/cellar/kubernetes/KubernetesDiscoveryServiceFactory.java
+++ b/kubernetes/src/main/java/org/apache/karaf/cellar/kubernetes/KubernetesDiscoveryServiceFactory.java
@@ -99,7 +99,6 @@ public class KubernetesDiscoveryServiceFactory implements ManagedServiceFactory
kubernetesDiscoveryService.init();
newServiceRegistration = bundleContext.registerService(DiscoveryService.class.getName(), kubernetesDiscoveryService, (Dictionary) serviceProperties);
- registrations.put(pid, newServiceRegistration);
}
} finally {
ServiceRegistration oldServiceRegistration = (newServiceRegistration == null) ? registrations.remove(pid) : registrations.put(pid, newServiceRegistration);