Author: nfilotto Date: 2010-04-21 07:32:28 -0400 (Wed, 21 Apr 2010) New Revision: 2292 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexChangesFilter.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java Log: EXOJCR-687: getParameterTime used instead of getParameterInteger Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexChangesFilter.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexChangesFilter.java 2010-04-20 13:51:59 UTC (rev 2291) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexChangesFilter.java 2010-04-21 11:32:28 UTC (rev 2292) @@ -90,8 +90,8 @@ // try to get pushState parameters, since they are set programmatically only Boolean pushState = config.getParameterBoolean(QueryHandlerParams.PARAM_JBOSSCACHE_PUSHSTATE, false); - Integer pushStateTimeOut = - config.getParameterInteger(QueryHandlerParams.PARAM_JBOSSCACHE_PUSHSTATE_TIMEOUT, 10000); + Long pushStateTimeOut = + config.getParameterTime(QueryHandlerParams.PARAM_JBOSSCACHE_PUSHSTATE_TIMEOUT, 10000L); singletonStoreProperties.setProperty("pushStateWhenCoordinator", pushState.toString()); singletonStoreProperties.setProperty("pushStateWhenCoordinatorTimeout", pushStateTimeOut.toString()); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2010-04-20 13:51:59 UTC (rev 2291) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2010-04-21 11:32:28 UTC (rev 2292) @@ -98,7 +98,7 @@ public static final String JBOSSCACHE_EXPIRATION = "jbosscache-expiration-time"; - public static final int JBOSSCACHE_EXPIRATION_DEFAULT = 900000; // 15 minutes + public static final long JBOSSCACHE_EXPIRATION_DEFAULT = 900000; // 15 minutes public static final String ITEMS = "$ITEMS".intern(); @@ -307,7 +307,7 @@ // if expiration is used, set appropriate factory with with timeout set via configuration (or default one 15minutes) this.cache = new BufferedJBossCache(factory.createCache(wsConfig.getCache()), useExpiration, - wsConfig.getCache().getParameterInteger(JBOSSCACHE_EXPIRATION, JBOSSCACHE_EXPIRATION_DEFAULT)); + wsConfig.getCache().getParameterTime(JBOSSCACHE_EXPIRATION, JBOSSCACHE_EXPIRATION_DEFAULT)); this.itemsRoot = Fqn.fromElements(ITEMS); this.childNodes = Fqn.fromElements(CHILD_NODES);