You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2018/09/29 12:44:38 UTC
[openmeetings] branch master updated: [OPENMEETINGS-1938] deleted
users are not being restored
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 484ffbb [OPENMEETINGS-1938] deleted users are not being restored
484ffbb is described below
commit 484ffbb9abf302c529611ae395589ebb1d51097e
Author: Maxim Solodovnik <so...@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 88a3c86..09a4137 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
@@ -145,7 +145,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 ec5ba1b..b0b12c5 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
@@ -552,7 +552,7 @@ public class BackupImport {
List<User> list = readList(ser, f, "users.xml", "users", User.class);
int minLoginLength = getMinLoginLength();
for (User u : list) {
- if (u.getLogin() == null) {
+ if (u.getLogin() == null || u.isDeleted()) {
continue;
}
// check that email is unique