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 2016/09/02 13:14:58 UTC
[1/2] karaf-cellar git commit: [KARAF-4670] Postpone configuration
update if the hazelcastServiceFactory instance if not initialized yet
Repository: karaf-cellar
Updated Branches:
refs/heads/master 0f5fb110c -> 8b78846cb
[KARAF-4670] Postpone configuration update if the hazelcastServiceFactory instance if not initialized yet
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/9f960112
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/9f960112
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/9f960112
Branch: refs/heads/master
Commit: 9f9601126d685c76f49d3519bed5da5215771163
Parents: 0f5fb11
Author: Sergiy Shyrkov <ss...@jahia.com>
Authored: Thu Sep 1 09:03:07 2016 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Fri Sep 2 15:03:55 2016 +0200
----------------------------------------------------------------------
.../hazelcast/internal/osgi/Activator.java | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/9f960112/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/internal/osgi/Activator.java
----------------------------------------------------------------------
diff --git a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/internal/osgi/Activator.java b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/internal/osgi/Activator.java
index 9ebbfa3..d8b8e17 100644
--- a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/internal/osgi/Activator.java
+++ b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/internal/osgi/Activator.java
@@ -96,6 +96,8 @@ public class Activator extends BaseActivator implements ManagedService {
private volatile ServiceRegistration nodeMBeanRegistration;
private volatile ServiceRegistration groupMBeanRegistration;
+ private HashMap updatedConfig;
+
@Override
public void doStart() throws Exception {
@@ -172,6 +174,11 @@ public class Activator extends BaseActivator implements ManagedService {
hazelcastServiceFactory.setConfigurationManager(hazelcastConfigurationManager);
hazelcastServiceFactory.setBundleContext(bundleContext);
hazelcastServiceFactory.init();
+ if (updatedConfig != null) {
+ // we have outstanding configuration update: do it now
+ updated(updatedConfig);
+ updatedConfig = null;
+ }
LOGGER.debug("CELLAR HAZELCAST:�register Hazelcast instance");
hazelcastInstance = hazelcastServiceFactory.getInstance();
@@ -394,11 +401,19 @@ public class Activator extends BaseActivator implements ManagedService {
Object key = keys.nextElement();
map.put(key, config.get(key));
}
+ if (hazelcastServiceFactory != null) {
+ updated(map);
+ } else {
+ // postpone configuration update
+ updatedConfig = map;
+ }
+ }
+
+ private void updated(HashMap config) {
try {
- hazelcastServiceFactory.update(map);
+ hazelcastServiceFactory.update(config);
} catch (Exception e) {
LOGGER.error("Can't update Hazelcast service factory", e);
}
}
-
}
[2/2] karaf-cellar git commit: [KARAF-4670] This closes #31
Posted by jb...@apache.org.
[KARAF-4670] This closes #31
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/8b78846c
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/8b78846c
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/8b78846c
Branch: refs/heads/master
Commit: 8b78846cbdf61adeae38228c8bbe3ad377e9983c
Parents: 0f5fb11 9f96011
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Fri Sep 2 15:14:43 2016 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Fri Sep 2 15:14:43 2016 +0200
----------------------------------------------------------------------
.../hazelcast/internal/osgi/Activator.java | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------