[openmeetings] branch 4.0.x updated: [OPENMEETINGS-2110] backup restore should be fixed

[solomax]

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

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


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

commit c0f5c3b63805f030662cb34c8146227d3f18bc09
Author: Maxim Solodovnik <solomax...@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 494cf19..aedec16 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
@@ -722,7 +722,11 @@ public class BackupImport {
                List<ChatMessage> list = readList(serializer, f, 
"chat_messages.xml", "chat_messages", ChatMessage.class, null, true);
                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());