Repository: openmeetings Updated Branches: refs/heads/3.3.x 1175e5c86 -> c36434c2d
[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/c36434c2 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/c36434c2 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/c36434c2 Branch: refs/heads/3.3.x Commit: c36434c2d68804e926d53e150d5de9eb8d0e0c1f Parents: 1175e5c 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:26 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/c36434c2/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 bc0c578..35386aa 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 @@ -125,6 +125,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; @@ -152,7 +153,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() {
