You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2017/02/24 20:07:03 UTC
airavata git commit: fixing duplicate entries from search results
Repository: airavata
Updated Branches:
refs/heads/develop af4a04ec6 -> 1378dbdb0
fixing duplicate entries from search results
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/1378dbdb
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/1378dbdb
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/1378dbdb
Branch: refs/heads/develop
Commit: 1378dbdb0b7eafd96228ee7929bb77c4406c0096
Parents: af4a04e
Author: scnakandala <su...@gmail.com>
Authored: Fri Feb 24 15:06:59 2017 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Fri Feb 24 15:06:59 2017 -0500
----------------------------------------------------------------------
.../sharing/registry/db/repositories/EntityRepository.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/1378dbdb/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
index 4cf06f7..2d16d34 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
@@ -57,7 +57,7 @@ public class EntityRepository extends AbstractRepository<Entity, EntityEntity, E
groupIdString += groupId + "','";
groupIdString = groupIdString.substring(0, groupIdString.length()-2);
- String query = "SELECT E.* FROM ENTITY AS E INNER JOIN SHARING AS S ON (E.ENTITY_ID=S.ENTITY_ID AND E.DOMAIN_ID=S.DOMAIN_ID) WHERE " +
+ String query = "SELECT DISTINCT E.* FROM ENTITY AS E INNER JOIN SHARING AS S ON (E.ENTITY_ID=S.ENTITY_ID AND E.DOMAIN_ID=S.DOMAIN_ID) WHERE " +
"E.DOMAIN_ID = '" + domainId + "' AND " + "S.GROUP_ID IN(" + groupIdString + ") AND ";
for(SearchCriteria searchCriteria : filters){