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/12/25 13:35:29 UTC
[3/3] openmeetings git commit: [OPENMEETINGS-1775] chat messages
import is fixed
[OPENMEETINGS-1775] chat messages import is fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/b4060659
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/b4060659
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/b4060659
Branch: refs/heads/4.0.x
Commit: b4060659c7a25a59e6b5a9950085e5569b7030e8
Parents: 9d341f1
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Mon Dec 25 20:35:17 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Mon Dec 25 20:35:17 2017 +0700
----------------------------------------------------------------------
.../java/org/apache/openmeetings/db/dao/basic/ChatDao.java | 6 +++++-
.../main/java/org/apache/openmeetings/backup/BackupImport.java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4060659/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java
index fc374c4..0e651dc 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java
@@ -84,7 +84,11 @@ public class ChatDao {
}
public ChatMessage update(ChatMessage entity) {
- entity.setSent(new Date());
+ return update(entity, null);
+ }
+
+ public ChatMessage update(ChatMessage entity, Date sent) {
+ entity.setSent(sent == null ? new Date() : sent);
if (entity.getId() == null) {
em.persist(entity);
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b4060659/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
index 494c32e..8e2c015 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
@@ -661,7 +661,7 @@ public class BackupImport {
if (m.getFromUser() == null || m.getFromUser().getId() == null) {
continue;
}
- chatDao.update(m);
+ chatDao.update(m, m.getSent());
}
}