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/07/29 21:39:54 UTC
karaf-cellar git commit: [KARAF-3795] Define the hazelcast
instanceName (by System Property or fallback to "cellar")
Repository: karaf-cellar
Updated Branches:
refs/heads/cellar-2.3.x 3f635605f -> 924ce2d0d
[KARAF-3795] Define the hazelcast instanceName (by System Property or fallback to "cellar")
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/924ce2d0
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/924ce2d0
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/924ce2d0
Branch: refs/heads/cellar-2.3.x
Commit: 924ce2d0d9fba177278e530581432dd5ca02dc74
Parents: 3f63560
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Jul 29 21:38:26 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Jul 29 21:38:26 2015 +0200
----------------------------------------------------------------------
.../cellar/hazelcast/factory/HazelcastConfigurationManager.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/924ce2d0/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java
----------------------------------------------------------------------
diff --git a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java
index 12eecb8..ed27a1c 100644
--- a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java
+++ b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java
@@ -48,6 +48,11 @@ public class HazelcastConfigurationManager {
public Config getHazelcastConfig() {
System.setProperty("hazelcast.config", xmlConfigLocation);
Config config = new XmlConfigBuilder().build();
+ if (System.getProperty("hazelcast.instanceName") != null) {
+ config.setInstanceName(System.getProperty("hazelcast.instanceName"));
+ } else {
+ config.setInstanceName("cellar");
+ }
if (config.getNetworkConfig().getJoin().getTcpIpConfig().isEnabled() && discoveredMemberSet != null) {
if (discoveryServices != null && !discoveryServices.isEmpty()) {