Repository: airavata Updated Branches: refs/heads/develop bff26b618 -> 8035df961
resolved save method bug, it now accepts (userId,GatewayID) Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/8035df96 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/8035df96 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/8035df96 Branch: refs/heads/develop Commit: 8035df9613b5e8ad4c1839bce88767748079a98f Parents: bff26b6 Author: Anuj Bhandar <[email protected]> Authored: Thu Nov 17 11:30:39 2016 -0500 Committer: Anuj Bhandar <[email protected]> Committed: Thu Nov 17 11:30:39 2016 -0500 ---------------------------------------------------------------------- .../core/app/catalog/resources/UserResourceProfileResource.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/8035df96/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/UserResourceProfileResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/UserResourceProfileResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/UserResourceProfileResource.java index 8a5fdf7..42ef90a 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/UserResourceProfileResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/UserResourceProfileResource.java @@ -355,7 +355,8 @@ public class UserResourceProfileResource extends AppCatAbstractResource { EntityManager em = null; try { em = AppCatalogJPAUtils.getEntityManager(); - UserResourceProfile existingUserResourceProfile = em.find(UserResourceProfile.class, userId); + CompositeIdentifier primaryKey = new CompositeIdentifier(userId,gatewayID); + UserResourceProfile existingUserResourceProfile = em.find(UserResourceProfile.class, primaryKey); if (em.isOpen()) { if (em.getTransaction().isActive()){ em.getTransaction().rollback();
