From 602c4c4501dcd89cbce1d6ba61ba6bc75761d643 Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Sat, 18 Jan 2014 11:23:45 +0000
Subject: [PATCH] #396 feature - Getting all orgs from user including the children ones
---
securis/src/main/java/net/curisit/securis/services/UserResource.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/services/UserResource.java b/securis/src/main/java/net/curisit/securis/services/UserResource.java
index 2bc90ee..014ce20 100644
--- a/securis/src/main/java/net/curisit/securis/services/UserResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/UserResource.java
@@ -1,8 +1,9 @@
package net.curisit.securis.services;
-import java.util.ArrayList;
import java.util.Date;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import javax.inject.Inject;
import javax.inject.Provider;
@@ -113,10 +114,10 @@
return modify(user, user.getUsername(), token);
}
- List<Organization> orgs = null;
+ Set<Organization> orgs = null;
List<Integer> orgsIds = user.getOrgsIds();
if (orgsIds != null && orgsIds.size() > 0) {
- orgs = new ArrayList<>();
+ orgs = new HashSet<>();
for (Integer orgId : orgsIds) {
Organization o = em.find(Organization.class, orgId);
if (o == null) {
@@ -152,10 +153,10 @@
return create(user, token);
}
- List<Organization> orgs = null;
+ Set<Organization> orgs = null;
List<Integer> orgsIds = user.getOrgsIds();
if (orgsIds != null && orgsIds.size() > 0) {
- orgs = new ArrayList<>();
+ orgs = new HashSet<>();
for (Integer orgId : orgsIds) {
Organization o = em.find(Organization.class, orgId);
if (o == null) {
--
Gitblit v1.3.2