Unify HazelcastInstance creation.
Change-Id: Ia54523b57a33329cbf883a98e912ccc1b50c02b1
diff --git a/src/main/java/net/onrc/onos/core/datastore/hazelcast/HZClient.java b/src/main/java/net/onrc/onos/core/datastore/hazelcast/HZClient.java
index ee7d862..eaa647c 100644
--- a/src/main/java/net/onrc/onos/core/datastore/hazelcast/HZClient.java
+++ b/src/main/java/net/onrc/onos/core/datastore/hazelcast/HZClient.java
@@ -74,8 +74,9 @@
* Get or create the Hazelcast Instance to use for datastore.
*/
private HZClient() {
+ Config config = HazelcastDatagrid.loadHazelcastConfig(BASE_CONFIG_FILENAME);
// Try to get the existing HZ instance in JVM if possible.
- HazelcastInstance instance = Hazelcast.getHazelcastInstanceByName(HazelcastDatagrid.ONOS_HAZELCAST_INSTANCE);
+ HazelcastInstance instance = Hazelcast.getOrCreateHazelcastInstance(config);
if (instance == null) {
log.error("Failed to get the Hazelcast instance in JVM. "
+ "Probably DataStoreClient was requested before "