You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by go...@apache.org on 2017/07/06 18:01:13 UTC
[1/2] airavata git commit: [AIRAVATA-2421] Clear the EntityManager
cache
Repository: airavata
Updated Branches:
refs/heads/develop 774b4c968 -> a0c6b891f
[AIRAVATA-2421] Clear the EntityManager cache
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d3bc3b6e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d3bc3b6e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d3bc3b6e
Branch: refs/heads/develop
Commit: d3bc3b6e2613c2395a949817e6a4d5df51ce8da1
Parents: f1f3712
Author: Gourav Shenoy <go...@apache.org>
Authored: Thu Jul 6 14:01:01 2017 -0400
Committer: Gourav Shenoy <go...@apache.org>
Committed: Thu Jul 6 14:01:01 2017 -0400
----------------------------------------------------------------------
.../registry/core/app/catalog/util/AppCatalogJPAUtils.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/d3bc3b6e/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
index 01f9bbc..099c088 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
@@ -73,6 +73,10 @@ public class AppCatalogJPAUtils {
factory.getCache().evictAll();
}
appCatEntityManager = factory.createEntityManager();
+ // clear the entitymanager cache
+ if (appCatEntityManager != null) {
+ appCatEntityManager.clear();
+ }
return appCatEntityManager;
}
[2/2] airavata git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/airavata into develop
Posted by go...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a0c6b891
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a0c6b891
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a0c6b891
Branch: refs/heads/develop
Commit: a0c6b891fd1af6b8ee61f55ab1a7d44743533853
Parents: d3bc3b6 774b4c9
Author: Gourav Shenoy <go...@apache.org>
Authored: Thu Jul 6 14:01:08 2017 -0400
Committer: Gourav Shenoy <go...@apache.org>
Committed: Thu Jul 6 14:01:08 2017 -0400
----------------------------------------------------------------------
.../lib/Airavata/Model/Tenant/Types.php | 2 +
.../lib/Airavata/Model/Workspace/Types.php | 2 +
.../Profile/Tenant/CPI/TenantProfileService.php | 28 ++--
.../core/impl/TenantManagementKeycloakImpl.java | 1 +
.../repositories/AbstractRepository.java | 18 +++
.../profile/commons/utils/QueryConstants.java | 4 +-
.../handlers/TenantProfileServiceHandler.java | 6 +-
.../tenant/cpi/TenantProfileService.java | 138 +++++++++----------
.../repositories/TenantProfileRepository.java | 8 +-
.../security/KeyCloakSecurityManager.java | 18 ++-
.../gfac/core/cluster/RemoteCluster.java | 8 +-
.../airavata/gfac/impl/BESRemoteCluster.java | 5 +-
.../airavata/gfac/impl/HPCRemoteCluster.java | 38 +++--
.../airavata/gfac/impl/LocalRemoteCluster.java | 9 +-
.../airavata/gfac/impl/task/ArchiveTask.java | 14 +-
.../gfac/impl/task/SCPDataStageTask.java | 95 +++++++++----
.../gfac/impl/task/utils/StreamData.java | 22 ++-
.../client/UserProfileServiceClientFactory.java | 43 ++++++
.../profile-tenant/profile-tenant-cpi.thrift | 2 +-
19 files changed, 297 insertions(+), 164 deletions(-)
----------------------------------------------------------------------