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 2017/11/09 07:59:14 UTC
openmeetings git commit: [OPENMEETINGS-1748] global chat is fixed
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x 53e0f0b99 -> a4d9c7d0f
[OPENMEETINGS-1748] global chat is fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/a4d9c7d0
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/a4d9c7d0
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/a4d9c7d0
Branch: refs/heads/4.0.x
Commit: a4d9c7d0fab1cb38a5e13d960b7a7ee345003dfd
Parents: 53e0f0b
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Nov 9 14:59:06 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Nov 9 14:59:06 2017 +0700
----------------------------------------------------------------------
.../apache/openmeetings/core/rss/LoadAtomRssFeed.java | 2 +-
.../openmeetings/db/dao/server/SessiondataDao.java | 12 +++++++-----
.../org/apache/openmeetings/web/user/chat/Chat.java | 4 +++-
3 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a4d9c7d0/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/LoadAtomRssFeed.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/LoadAtomRssFeed.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/LoadAtomRssFeed.java
index 9a05ccc..36fd61a 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/LoadAtomRssFeed.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/LoadAtomRssFeed.java
@@ -36,7 +36,7 @@ public class LoadAtomRssFeed {
private LoadAtomRssFeed() {}
public static HttpURLConnection getFeedConnection(String _url) throws IOException {
- log.debug("getFeedConnection:: " + _url);
+ log.trace("getFeedConnection:: {}", _url);
URL url = new URL(_url);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a4d9c7d0/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java
index 52251b3..170e22a 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java
@@ -151,12 +151,14 @@ public class SessiondataDao {
*/
public void clearSessionTable(long timeout) {
try {
- log.debug("****** clearSessionTable: ");
+ log.trace("****** clearSessionTable: ");
List<Sessiondata> l = getSessionToDelete(new Date(System.currentTimeMillis() - timeout));
- log.debug("clearSessionTable: " + l.size());
- for (Sessiondata sData : l) {
- sData = em.find(Sessiondata.class, sData.getId());
- em.remove(sData);
+ if (!l.isEmpty()) {
+ log.debug("clearSessionTable: {}", l.size());
+ for (Sessiondata sData : l) {
+ sData = em.find(Sessiondata.class, sData.getId());
+ em.remove(sData);
+ }
}
} catch (Exception err) {
log.error("clearSessionTable", err);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a4d9c7d0/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
index 380ae41..3d66933 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
@@ -37,6 +37,7 @@ import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
import java.time.Duration;
import java.time.Instant;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -164,11 +165,12 @@ public class Chat extends Panel {
ChatDao dao = getBean(ChatDao.class);
//TODO limited count should be loaded with "earlier" link
StringBuilder sb = new StringBuilder(getReinit());
+ List<ChatMessage> list = new ArrayList<>(dao.getGlobal(0, 30));
for(Long roomId : getUserRooms(getUserId())) {
Room r = getBean(RoomDao.class).get(roomId);
sb.append(addRoom(r));
}
- List<ChatMessage> list = dao.getUserRecent(getUserId(), Date.from(Instant.now().minus(Duration.ofHours(1L))), 0, 30);
+ list.addAll(dao.getUserRecent(getUserId(), Date.from(Instant.now().minus(Duration.ofHours(1L))), 0, 30));
if (!list.isEmpty()) {
sb.append("Chat.addMessage(").append(getMessage(list).toString()).append(");");
}