[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1938] deleted users are not being restored

[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 8e429a0  [OPENMEETINGS-1938] deleted users are not being restored
8e429a0 is described below

commit 8e429a067eb6b7d90932540ae663c06095f34964
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Sat Sep 29 19:43:54 2018 +0700

    [OPENMEETINGS-1938] deleted users are not being restored
---
 .../src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java     | 2 +-
 .../main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java   | 2 +-
 .../src/main/java/org/apache/openmeetings/backup/BackupImport.java      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java
index c44966f..5eda065 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupDao.java
@@ -123,7 +123,7 @@ public class GroupDao implements 
IGroupAdminDataProviderDao<Group> {
                                entity.setUpdatedby(userId);
                        }
                        entity.setUpdated(new Date());
-                       em.merge(entity);
+                       entity = em.merge(entity);
                }
                return entity;
        }
diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
index bac4307..9e87763 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
@@ -146,7 +146,7 @@ public class UserContactDao {
                        em.persist(c);
                } else {
                        c.setUpdated(new Date());
-                       em.merge(c);
+                       c = em.merge(c);
                }
                return c;
        }
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 367bee4..00bd02d 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
@@ -557,7 +557,7 @@ public class BackupImport {
                List<User> list = readUserList(f, "users.xml", "users");
                int minLoginLength = getMinLoginLength();
                for (User u : list) {
-                       if (u.getLogin() == null) {
+                       if (u.getLogin() == null || u.isDeleted()) {
                                continue;
                        }
                        if (u.getType() == User.Type.contact && 
u.getLogin().length() < minLoginLength) {