[openmeetings] branch master updated: no jira: NPE check is added

[solomax]

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 d36e0e1  no jira: NPE check is added
d36e0e1 is described below

commit d36e0e1130df6a77b5656cd87c391a1730d8d140
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Wed Jun 3 10:25:18 2020 +0700

    no jira: NPE check is added
---
 .../src/main/java/org/apache/openmeetings/backup/BackupImport.java     | 3 +++
 1 file changed, 3 insertions(+)

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 648da89..5c1fcdb 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
@@ -745,6 +745,9 @@ public class BackupImport {
                unmarshaller.setAdapter(new GroupAdapter(groupDao, groupMap));
 
                readList(unmarshaller, base, "rooms_organisation.xml", 
ROOM_GRP_LIST_NODE, ROOM_GRP_NODE, eClazz, rg -> {
+                       if (rg.getRoom() == null || rg.getGroup() == null) {
+                               return;
+                       }
                        Room r = roomDao.get(rg.getRoom().getId());
                        if (r == null || rg.getGroup().getId() == null) {
                                return;