You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2018/02/26 11:56:22 UTC
[openmeetings] 02/02: Merge branch 'master' into
OPENMEETINGS-1649-kurento
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch OPENMEETINGS-1649-kurento
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 457ea1247758455c2669937751195f8b581bee0b
Merge: 39190c4 a01a979
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Mon Feb 26 18:56:00 2018 +0700
Merge branch 'master' into OPENMEETINGS-1649-kurento
.../apache/openmeetings/db/entity/room/Room.java | 1 +
openmeetings-server/src/site/xdoc/security.xml | 2 +-
.../apache/openmeetings/web/app/ClientManager.java | 15 +-
.../openmeetings/web/app/QuickPollManager.java | 11 +-
.../openmeetings/web/app/StreamClientManager.java | 14 +-
.../openmeetings/web/app/WhiteboardManager.java | 11 +-
.../openmeetings/web/room/menu/ActionsSubMenu.java | 181 +++++++++++++++++++++
.../openmeetings/web/room/menu/PollsSubMenu.java | 14 +-
.../openmeetings/web/room/menu/RoomMenuPanel.java | 135 ++-------------
9 files changed, 214 insertions(+), 170 deletions(-)
diff --cc openmeetings-web/src/main/java/org/apache/openmeetings/web/app/QuickPollManager.java
index 67545b7,e377c8b..f5e01e1
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/QuickPollManager.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/QuickPollManager.java
@@@ -41,17 -39,11 +38,11 @@@ import com.hazelcast.core.IMap
@Component
public class QuickPollManager {
- private static final Logger log = getLogger(QuickPollManager.class, getWebAppRootKey());
+ private static final Logger log = LoggerFactory.getLogger(QuickPollManager.class);
private static final String QPOLLS_KEY = "QPOLLS_KEY";
- private HazelcastInstance hazelcast;
-
- @PostConstruct
- private void init() {
- this.hazelcast = getHazelcast();
- }
private IMap<Long, Map<Long, Boolean>> map() {
- return hazelcast.getMap(QPOLLS_KEY);
+ return getHazelcast().getMap(QPOLLS_KEY);
}
public boolean isStarted(Long roomId) {
diff --cc openmeetings-web/src/main/java/org/apache/openmeetings/web/app/StreamClientManager.java
index 63fbc7f,bee0af1..a9c6b00
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/StreamClientManager.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/StreamClientManager.java
@@@ -69,9 -67,8 +65,8 @@@ import org.springframework.stereotype.C
*/
@Component
public class StreamClientManager implements IStreamClientManager {
- protected static final Logger log = Red5LoggerFactory.getLogger(StreamClientManager.class, getWebAppRootKey());
+ protected static final Logger log = LoggerFactory.getLogger(StreamClientManager.class);
private static final String STREAM_CLIENT_KEY = "STREAM_CLIENT_KEY";
- private HazelcastInstance hazelcast;
@Autowired
private ClientManager clientManager;
--
To stop receiving notification emails like this one, please contact
solomax@apache.org.