Author: bleny Date: 2014-06-19 10:56:45 +0200 (Thu, 19 Jun 2014) New Revision: 2063 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2063 Log: when caching is disabled do not add listerners Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java 2014-06-19 08:45:05 UTC (rev 2062) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java 2014-06-19 08:56:45 UTC (rev 2063) @@ -153,15 +153,19 @@ WaoTopiaPersistenceContext persistenceContext = getTopiaApplicationContext().newPersistenceContext(); - CacheInvalidationTopiaEntityListener cacheInvalidationTopiaEntityListener = - new CacheInvalidationTopiaEntityListener( - getSamplingPlansCache(), - getBoatsFilterValuesCache(), - getSynthesesCache()); + if (applicationConfig.isCachingEnabled()) { - persistenceContext.getTopiaFiresSupport().addTopiaEntityListener(cacheInvalidationTopiaEntityListener); - persistenceContext.getTopiaFiresSupport().addTopiaTransactionListener(cacheInvalidationTopiaEntityListener); + CacheInvalidationTopiaEntityListener cacheInvalidationTopiaEntityListener = + new CacheInvalidationTopiaEntityListener( + getSamplingPlansCache(), + getBoatsFilterValuesCache(), + getSynthesesCache()); + persistenceContext.getTopiaFiresSupport().addTopiaEntityListener(cacheInvalidationTopiaEntityListener); + persistenceContext.getTopiaFiresSupport().addTopiaTransactionListener(cacheInvalidationTopiaEntityListener); + + } + return persistenceContext; }