[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/3b274b6f Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/3b274b6f Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/3b274b6f Branch: refs/heads/master Commit: 3b274b6fa89f2f50f4ab8d337389c7e2b6c5a521 Parents: 8904003 Author: Maxim Solodovnik <[email protected]> Authored: Mon Dec 25 20:35:17 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Mon Dec 25 20:36:19 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/3b274b6f/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/3b274b6f/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 fc7d804..f86a3ea 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 @@ -687,7 +687,7 @@ public class BackupImport { if (m.getFromUser() == null || m.getFromUser().getId() == null) { continue; } - chatDao.update(m); + chatDao.update(m, m.getSent()); } }
