From 6c93a118afe2d8d9ed9299f74e01e10c78e94bf4 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Fri, 16 Oct 2020 15:58:54 +0200
Subject: [PATCH] Bug fix #19978

---
 pom.xml                                                     | 2 +-
 .../usermanagement/impl/LiferayUserManager.java             | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9e22de7..d950c9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>org.gcube.dvos</groupId>
 	<artifactId>usermanagement-core</artifactId>
-	<version>2.5.1</version>
+	<version>2.5.2-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>User Management API</name>
diff --git a/src/main/java/org/gcube/vomanagement/usermanagement/impl/LiferayUserManager.java b/src/main/java/org/gcube/vomanagement/usermanagement/impl/LiferayUserManager.java
index db0d77a..182561f 100644
--- a/src/main/java/org/gcube/vomanagement/usermanagement/impl/LiferayUserManager.java
+++ b/src/main/java/org/gcube/vomanagement/usermanagement/impl/LiferayUserManager.java
@@ -894,7 +894,11 @@ public class LiferayUserManager implements UserManager {
 			List<MembershipRequest> list = MembershipRequestLocalServiceUtil.dynamicQuery(queryListPendingMembershipRequestsByGroup);
 			for (MembershipRequest req : list) {
 				if (req.getGroupId() == groupId) {
-					toReturn.add(mapLRMembershipRequest(req));
+					try {
+						toReturn.add(mapLRMembershipRequest(req));
+					} catch (com.liferay.portal.NoSuchUserException e) {
+						_log.warn("Could not map membership request, userid no longer exists: "+req.getUserId());
+					}
 				}
 			}