diff --git a/pom.xml b/pom.xml index c218335..93d3b0f 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.gcube.applicationsupportlayer aslcore - 3.2.2-SNAPSHOT + 3.2.1-SNAPSHOT Application Support Layer Core diff --git a/src/main/java/org/gcube/application/framework/core/cache/CachesManager.java b/src/main/java/org/gcube/application/framework/core/cache/CachesManager.java index 975f01a..15dae39 100644 --- a/src/main/java/org/gcube/application/framework/core/cache/CachesManager.java +++ b/src/main/java/org/gcube/application/framework/core/cache/CachesManager.java @@ -91,6 +91,8 @@ public class CachesManager { public Ehcache getGenericResourceCache() { return caches.get("genericResourceCache"); } + + /** * @return the cache that contains the search configurations diff --git a/src/main/java/org/gcube/application/framework/core/util/GenericResource.java b/src/main/java/org/gcube/application/framework/core/util/GenericResource.java index 78e489e..b11e4e5 100644 --- a/src/main/java/org/gcube/application/framework/core/util/GenericResource.java +++ b/src/main/java/org/gcube/application/framework/core/util/GenericResource.java @@ -224,7 +224,8 @@ public class GenericResource implements GenericResourceInfoI { query1.addParameter(CacheEntryConstants.vre, session.getOriginalScopeName()); if(CachesManager.getInstance().getGenericResourceCache().isElementInMemory(query1) || CachesManager.getInstance().getGenericResourceCache().isElementOnDisk(query1)) { - CachesManager.getInstance().getGenericResourceCache().get(query1).setTimeToLive(-1); + //CachesManager.getInstance().getGenericResourceCache().get(query1).setTimeToLive(-1); + CachesManager.getInstance().getGenericResourceCache().remove(query1); } else { logger.info("The generic resource was not found"); @@ -334,6 +335,7 @@ public class GenericResource implements GenericResourceInfoI { if(CachesManager.getInstance().getGenericResourceCache().isElementInMemory(query) || CachesManager.getInstance().getGenericResourceCache().isElementOnDisk(query)) { genericResource = ((List)CachesManager.getInstance().getGenericResourceCache().get(query).getValue()).get(0); + //TODO CachesManager.getInstance().getGenericResourceCache().get(query).setTimeToLive(0); } @@ -342,6 +344,7 @@ public class GenericResource implements GenericResourceInfoI { query.addParameter(CacheEntryConstants.vre, session.getOriginalScopeName()); if(CachesManager.getInstance().getGenericResourceCache().isElementInMemory(query) || CachesManager.getInstance().getGenericResourceCache().isElementOnDisk(query)) { + //TODO CachesManager.getInstance().getGenericResourceCache().get(query).setTimeToLive(0); } } catch (ISPublisherException e) {