From c1d473f8d4b82fd2bad4a4914a9096f5b119b0a3 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Thu, 29 Oct 2020 11:54:15 +0200
Subject: [PATCH] When merging users remove the email from the user to be
 merged

---
 .../eu/eudat/logic/managers/MergeEmailConfirmationManager.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/MergeEmailConfirmationManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/MergeEmailConfirmationManager.java
index 58639f0f7..9b67a9ff8 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/MergeEmailConfirmationManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/MergeEmailConfirmationManager.java
@@ -90,6 +90,7 @@ public class MergeEmailConfirmationManager {
 			databaseRepository.getUserDmpDao().createOrUpdate(userDmp);
 		});
 		oldUser.setUserStatus((short)1);
+		oldUser.setEmail(null);
 		databaseRepository.getUserInfoDao().createOrUpdate(oldUser);
 	}