From 63c525fe5c4ba4847d0e87192fb61a3c81deb262 Mon Sep 17 00:00:00 2001 From: Costantino Perciante Date: Mon, 15 Jan 2018 10:34:05 +0000 Subject: [PATCH] fix for extending roles structures git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/ckan-util-library@162165 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../ckanutillibrary/server/DataCatalogueFactory.java | 4 +--- .../ckanutillibrary/server/DataCatalogueRunningCluster.java | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueFactory.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueFactory.java index 536033e..542d882 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueFactory.java +++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueFactory.java @@ -73,8 +73,6 @@ public class DataCatalogueFactory { * @return */ private boolean expired(CacheBean cacheBean) { - boolean expired = (cacheBean.ttl + MAX_LIFETIME <= System.currentTimeMillis()); - logger.debug("expired is " + expired); - return expired; + return (cacheBean.ttl + MAX_LIFETIME < System.currentTimeMillis()); } } diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueRunningCluster.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueRunningCluster.java index ae98d59..a3df86e 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueRunningCluster.java +++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueRunningCluster.java @@ -83,7 +83,7 @@ public class DataCatalogueRunningCluster { private boolean manageProductEnabled; private String urlResolver; private boolean alertUsers; - private static Map extendRoleInOrganization = new HashMap(0); + private Map extendRoleInOrganization = new HashMap(0); // generic role key public static final String CKAN_GENERIC_ROLE = "*"; @@ -415,7 +415,7 @@ public class DataCatalogueRunningCluster { * @throws IOException * @throws SAXException */ - private static void parseExtendingRoles() throws ParserConfigurationException, SAXException, IOException { + private void parseExtendingRoles() throws ParserConfigurationException, SAXException, IOException { Query q = new QueryBox("for $profile in collection('/db/Profiles/GenericResource')//Resource " + "where $profile/Profile/SecondaryType/string() eq 'ApplicationProfile' and $profile/Profile/Name/string() " +