[openmeetings] branch master updated: [OPENMEETINGS-2110] backup restore should be fixed

[so...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new e373292  [OPENMEETINGS-2110] backup restore should be fixed
e373292 is described below

commit e373292dcbc1769717a14fb0b178efb99f87576e
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Tue Sep 17 00:07:31 2019 +0700

    [OPENMEETINGS-2110] backup restore should be fixed
---
 .../src/main/java/org/apache/openmeetings/backup/BackupImport.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 7cdaa4b..1febc7c 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
@@ -736,7 +736,11 @@ public class BackupImport {
 		List<ChatMessage> list = readList(serializer, f, "chat_messages.xml", "chat_messages", ChatMessage.class);
 		for (ChatMessage m : list) {
 			m.setId(null);
-			if (m.getFromUser() == null || m.getFromUser().getId() == null) {
+			if (m.getFromUser() == null
+					|| m.getFromUser().getId() == null
+					|| (m.getToRoom() != null && m.getToRoom().getId() == null)
+					|| (m.getToUser() != null && m.getToUser().getId() == null))
+			{
 				continue;
 			}
 			chatDao.update(m, m.getSent());