Correcting bug in default space creation with Hazelcast

Close #101
janus-project · Feb 13, 2015 · 0035ee1 · 0035ee1
1 parent 9b20214
commit 0035ee1
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/...roject.kernel/src/main/java/io/janusproject/kernel/services/jdk/contextspace/Context.java b/...roject.kernel/src/main/java/io/janusproject/kernel/services/jdk/contextspace/Context.java
@@ -92,7 +92,13 @@ public String toString() {
 	EventSpace postConstruction() {
 		this.spaceRepository.postConstruction();
 		this.defaultSpace = createSpace(OpenEventSpaceSpecification.class, this.defaultSpaceID);
-		return this.defaultSpace;
+		if (this.defaultSpace != null) {
+			return this.defaultSpace;
+		}
+		//Could have been created before thanks to Hazelcast, thus createSpace returns null because the space already exist,
+		//in this case we return the already existing version stored in the repository
+		return (EventSpace) this.spaceRepository.getSpace(new SpaceID(this.id, this.defaultSpaceID,
+				OpenEventSpaceSpecification.class));
 	}
 
 	/** Destroy any associated resources.