From 911a1b976f2164de2707dfbf1ece79b0d8514480 Mon Sep 17 00:00:00 2001 From: Costantino Perciante Date: Sat, 28 Jan 2017 15:51:28 +0000 Subject: [PATCH] added check on organization existence git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/gcube-ckan-datacatalog@141886 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 1 + .../server/thread/AddUserToOrganizationThread.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.classpath b/.classpath index fd5f814..6d48382 100644 --- a/.classpath +++ b/.classpath @@ -33,5 +33,6 @@ + diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/thread/AddUserToOrganizationThread.java b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/thread/AddUserToOrganizationThread.java index b0614e6..1533c68 100644 --- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/thread/AddUserToOrganizationThread.java +++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/thread/AddUserToOrganizationThread.java @@ -41,7 +41,8 @@ public class AddUserToOrganizationThread extends Thread { Set> entrySet = orgAndCapacity.entrySet(); for (Entry entry : entrySet) { - instance.checkRoleIntoOrganization(username, entry.getKey(), RolesCkanGroupOrOrg.convertFromCapacity(entry.getValue())); + if(instance.getOrganizationByName(entry.getKey()) != null) + instance.checkRoleIntoOrganization(username, entry.getKey(), RolesCkanGroupOrOrg.convertFromCapacity(entry.getValue())); } logger.debug("Thread for role association ended");