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 2016/07/28 17:45:35 UTC
[21/57] airavata git commit: fixing id not set issue
fixing id not set issue
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2c1dc547
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2c1dc547
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2c1dc547
Branch: refs/heads/develop
Commit: 2c1dc547567f6028ba81d290e6977749536283c9
Parents: 59449b2
Author: scnakandala <su...@gmail.com>
Authored: Thu Jul 7 16:33:13 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Jul 7 16:33:13 2016 -0400
----------------------------------------------------------------------
.../apache/airavata/grouper/resource/ResourceServiceImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/2c1dc547/modules/group-manager/src/main/java/org/apache/airavata/grouper/resource/ResourceServiceImpl.java
----------------------------------------------------------------------
diff --git a/modules/group-manager/src/main/java/org/apache/airavata/grouper/resource/ResourceServiceImpl.java b/modules/group-manager/src/main/java/org/apache/airavata/grouper/resource/ResourceServiceImpl.java
index 36d7116..c3b40fe 100755
--- a/modules/group-manager/src/main/java/org/apache/airavata/grouper/resource/ResourceServiceImpl.java
+++ b/modules/group-manager/src/main/java/org/apache/airavata/grouper/resource/ResourceServiceImpl.java
@@ -205,8 +205,8 @@ public class ResourceServiceImpl {
Set<Resource> resources = new HashSet<Resource>();
for (PermissionEntry entry: permissions) {
- Resource resource = new Resource(entry.getAttributeDefNameDispName(), resourceType);
- resource.setName(entry.getAttributeDefName().getExtension());
+ Resource resource = new Resource(entry.getAttributeDefName().getExtension(), resourceType);
+ resource.setName(entry.getAttributeDefNameDispName());
//TODO: Discuss it with Suresh and Supun. It might cause some performance issues. We probably should not populate the parent id since caller will already have it.
// Set<AttributeDefName> parentAttributeDefNames = entry.getAttributeDefName().getAttributeDefNameSetDelegate().getAttributeDefNamesThatImplyThisImmediate();