Repository: openmeetings Updated Branches: refs/heads/master 3c020e88e -> 1abf6390e
[OPENMEETINGS-1677] tests should be fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/1abf6390 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/1abf6390 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/1abf6390 Branch: refs/heads/master Commit: 1abf6390e44b9a75a44d4fb56535202023236e58 Parents: 3c020e8 Author: Maxim Solodovnik <[email protected]> Authored: Tue Aug 1 13:17:26 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Tue Aug 1 13:17:48 2017 +0700 ---------------------------------------------------------------------- .../main/java/org/apache/openmeetings/web/app/Application.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1abf6390/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java index d4d95d0..7fed2c9 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java @@ -126,6 +126,7 @@ import org.wicketstuff.dashboard.web.DashboardContextInjector; import org.wicketstuff.dashboard.web.DashboardSettings; import org.wicketstuff.datastores.hazelcast.HazelcastDataStore; +import com.hazelcast.config.XmlConfigBuilder; import com.hazelcast.core.Hazelcast; import com.hazelcast.core.HazelcastInstance; import com.hazelcast.core.Member; @@ -154,7 +155,7 @@ public class Application extends AuthenticatedWebApplication implements IApplica public static final String NOTINIT_MAPPING = "/notinited"; private String xFrameOptions = HEADER_XFRAME_SAMEORIGIN; private String contentSecurityPolicy = OpenmeetingsVariables.HEADER_CSP_SELF; - private final HazelcastInstance hazelcast = Hazelcast.newHazelcastInstance(); + private final HazelcastInstance hazelcast = Hazelcast.getOrCreateHazelcastInstance(new XmlConfigBuilder().build()); @Override protected void init() {
