Renamed the variable interval to sessionValidationInterval to make it consistent across implemetations.
diff --git a/core/src/main/java/org/apache/shiro/session/mgt/AbstractValidatingSessionManager.java b/core/src/main/java/org/apache/shiro/session/mgt/AbstractValidatingSessionManager.java
index e6a1bb3..8991bba 100644
--- a/core/src/main/java/org/apache/shiro/session/mgt/AbstractValidatingSessionManager.java
+++ b/core/src/main/java/org/apache/shiro/session/mgt/AbstractValidatingSessionManager.java
@@ -213,7 +213,7 @@
log.debug("No sessionValidationScheduler set. Attempting to create default instance.");
}
scheduler = new ExecutorServiceSessionValidationScheduler(this);
- scheduler.setInterval(getSessionValidationInterval());
+ scheduler.setSessionValidationInterval(getSessionValidationInterval());
if (log.isTraceEnabled()) {
log.trace("Created default SessionValidationScheduler instance of type [" + scheduler.getClass().getName() + "].");
}
diff --git a/core/src/main/java/org/apache/shiro/session/mgt/ExecutorServiceSessionValidationScheduler.java b/core/src/main/java/org/apache/shiro/session/mgt/ExecutorServiceSessionValidationScheduler.java
index 657a377..fc10de7 100644
--- a/core/src/main/java/org/apache/shiro/session/mgt/ExecutorServiceSessionValidationScheduler.java
+++ b/core/src/main/java/org/apache/shiro/session/mgt/ExecutorServiceSessionValidationScheduler.java
@@ -31,7 +31,7 @@
/**
* SessionValidationScheduler implementation that uses a
* {@link ScheduledExecutorService} to call {@link ValidatingSessionManager#validateSessions()} every
- * <em>{@link #getInterval interval}</em> milliseconds.
+ * <em>{@link #getSessionValidationInterval sessionValidationInterval}</em> milliseconds.
*
* @since 0.9
*/
@@ -44,7 +44,7 @@
ValidatingSessionManager sessionManager;
private ScheduledExecutorService service;
- private long interval = DefaultSessionManager.DEFAULT_SESSION_VALIDATION_INTERVAL;
+ private long sessionValidationInterval = DefaultSessionManager.DEFAULT_SESSION_VALIDATION_INTERVAL;
private boolean enabled = false;
private String threadNamePrefix = "SessionValidationThread-";
@@ -64,12 +64,12 @@
this.sessionManager = sessionManager;
}
- public long getInterval() {
- return interval;
+ public long getSessionValidationInterval() {
+ return sessionValidationInterval;
}
- public void setInterval(long interval) {
- this.interval = interval;
+ public void setSessionValidationInterval(long sessionValidationInterval) {
+ this.sessionValidationInterval = sessionValidationInterval;
}
public boolean isEnabled() {
@@ -91,7 +91,7 @@
//TODO Implement an integration test to test for jvm exit as part of the standalone example
// (so we don't have to change the unit test execution model for the core module)
public void enableSessionValidation() {
- if (this.interval > 0l) {
+ if (this.sessionValidationInterval > 0l) {
this.service = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() {
private final AtomicInteger count = new AtomicInteger(1);
@@ -102,7 +102,8 @@
return thread;
}
});
- this.service.scheduleAtFixedRate(this, interval, interval, TimeUnit.MILLISECONDS);
+ this.service.scheduleAtFixedRate(this, sessionValidationInterval,
+ sessionValidationInterval, TimeUnit.MILLISECONDS);
}
this.enabled = true;
}
diff --git a/core/src/test/java/org/apache/shiro/session/mgt/ExecutorServiceSessionValidationSchedulerTest.java b/core/src/test/java/org/apache/shiro/session/mgt/ExecutorServiceSessionValidationSchedulerTest.java
index bb5ba64..8ae53a6 100644
--- a/core/src/test/java/org/apache/shiro/session/mgt/ExecutorServiceSessionValidationSchedulerTest.java
+++ b/core/src/test/java/org/apache/shiro/session/mgt/ExecutorServiceSessionValidationSchedulerTest.java
@@ -36,7 +36,7 @@
executorServiceSessionValidationScheduler = new ExecutorServiceSessionValidationScheduler();
executorServiceSessionValidationScheduler.setSessionManager(defaultSessionManager);
executorServiceSessionValidationScheduler.setThreadNamePrefix("test-");
- executorServiceSessionValidationScheduler.setInterval(1000L);
+ executorServiceSessionValidationScheduler.setSessionValidationInterval(1000L);
executorServiceSessionValidationScheduler.enableSessionValidation();
}
@@ -81,7 +81,7 @@
executorServiceSessionValidationScheduler = new ExecutorServiceSessionValidationScheduler();
executorServiceSessionValidationScheduler.setSessionManager(defaultSessionManager);
executorServiceSessionValidationScheduler.setThreadNamePrefix("test-");
- executorServiceSessionValidationScheduler.setInterval(1000L);
+ executorServiceSessionValidationScheduler.setSessionValidationInterval(1000L);
executorServiceSessionValidationScheduler.enableSessionValidation();
defaultSessionManager.create(session);
Thread.sleep(2000L);
@@ -101,4 +101,4 @@
throw new RuntimeException("Session test exception");
}
}
-}
\ No newline at end of file
+}
