Now really fixed what the previous commit should do
git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/application-support-layer/applicationSupportLayerCore@86613 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
c33f589a55
commit
caba372362
|
@ -298,7 +298,7 @@ public class GenericResource implements GenericResourceInfoI {
|
|||
genRes.add(genericResource);
|
||||
QueryString query1 = new QueryString();
|
||||
query1.addParameter(CacheEntryConstants.id, genericResource.getId());
|
||||
query1.addParameter(CacheEntryConstants.vre, session.getOriginalScopeName());
|
||||
query1.addParameter(CacheEntryConstants.vre, session.getScope());
|
||||
CachesManager.getInstance().getGenericResourceCache().put(new net.sf.ehcache.Element(query1, genRes));
|
||||
logger.info("...added in cache");
|
||||
|
||||
|
@ -352,24 +352,24 @@ public class GenericResource implements GenericResourceInfoI {
|
|||
}
|
||||
|
||||
QueryString query1 = new QueryString();
|
||||
query1.addParameter(CacheEntryConstants.name, genericResource.getName().trim());
|
||||
query1.addParameter(CacheEntryConstants.vre, session.getOriginalScopeName());
|
||||
query1.addParameter(CacheEntryConstants.name, genericResource.getName());
|
||||
query1.addParameter(CacheEntryConstants.vre, session.getScope());
|
||||
if(CachesManager.getInstance().getGenericResourceCache().isElementInMemory(query1) || CachesManager.getInstance().getGenericResourceCache().isElementOnDisk(query1))
|
||||
{
|
||||
logger.info("Replacing generic resource in cache...");
|
||||
logger.info("Removing old generic resource from cache...");
|
||||
CachesManager.getInstance().getGenericResourceCache().get(query1).setTimeToLive(0);
|
||||
CachesManager.getInstance().getGenericResourceCache().remove(query1);
|
||||
}
|
||||
else {
|
||||
logger.info("The generic resource to replace in cache was not found");
|
||||
}
|
||||
|
||||
query1.clear();
|
||||
logger.info("...and adding new generic resource in cache.");
|
||||
QueryString query2 = new QueryString();
|
||||
List<ISGenericResource> genRes = new ArrayList<ISGenericResource>();
|
||||
genRes.add(genericResource);
|
||||
query1.addParameter(CacheEntryConstants.id, genericResource.getId());
|
||||
query1.addParameter(CacheEntryConstants.vre, session.getOriginalScopeName());
|
||||
CachesManager.getInstance().getGenericResourceCache().put(new net.sf.ehcache.Element(query1, genRes));
|
||||
query2.addParameter(CacheEntryConstants.id, genericResource.getId());
|
||||
query2.addParameter(CacheEntryConstants.vre, session.getScope());
|
||||
CachesManager.getInstance().getGenericResourceCache().put(new net.sf.ehcache.Element(query2, genRes));
|
||||
|
||||
|
||||
|
||||
|
@ -461,19 +461,19 @@ public class GenericResource implements GenericResourceInfoI {
|
|||
logger.info("Removed generic resource from IS");
|
||||
QueryString queryString = new QueryString();
|
||||
queryString.addParameter(CacheEntryConstants.id, genericResource.getId());
|
||||
queryString.addParameter(CacheEntryConstants.vre, session.getOriginalScopeName());
|
||||
queryString.addParameter(CacheEntryConstants.vre, session.getScope());
|
||||
if(CachesManager.getInstance().getGenericResourceCache().isElementInMemory(queryString) || CachesManager.getInstance().getGenericResourceCache().isElementOnDisk(queryString)){
|
||||
genericResource = ((List<ISGenericResource>)CachesManager.getInstance().getGenericResourceCache().get(queryString).getValue()).get(0);
|
||||
//TODO
|
||||
CachesManager.getInstance().getGenericResourceCache().get(queryString).setTimeToLive(0);
|
||||
}
|
||||
queryString.clear();
|
||||
queryString.put(CacheEntryConstants.name, genericResource.getName());
|
||||
queryString.addParameter(CacheEntryConstants.vre, session.getOriginalScopeName());
|
||||
if(CachesManager.getInstance().getGenericResourceCache().isElementInMemory(queryString) || CachesManager.getInstance().getGenericResourceCache().isElementOnDisk(queryString)){
|
||||
//TODO
|
||||
CachesManager.getInstance().getGenericResourceCache().get(queryString).setTimeToLive(0);
|
||||
}
|
||||
// queryString.clear();
|
||||
// queryString.put(CacheEntryConstants.name, genericResource.getName());
|
||||
// queryString.addParameter(CacheEntryConstants.vre, session.getScope());
|
||||
// if(CachesManager.getInstance().getGenericResourceCache().isElementInMemory(queryString) || CachesManager.getInstance().getGenericResourceCache().isElementOnDisk(queryString)){
|
||||
// //TODO
|
||||
// CachesManager.getInstance().getGenericResourceCache().get(queryString).setTimeToLive(0);
|
||||
// }
|
||||
} catch (PublisherException e) {
|
||||
logger.error("Exception:", e);
|
||||
throw new RemoteException();
|
||||
|
|
Loading…
Reference in New Issue