Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #941 

Make scavenger thread able to be disabled.
This commit is contained in:
Jan Bartel 2016-09-22 15:29:27 +10:00
parent 1e6c5fac6b
commit 133d584b94
129 changed files with 344 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jetty-gcloud/jetty-gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStore.java
View File

@ -108,11 +108,6 @@ public class GCloudSessionDataStore extends AbstractSessionDataStore
protected String _maxInactive = MAXINACTIVE;
protected String _attributes = ATTRIBUTES;
public EntityDataModel()
{
System.err.println("NEW CALLED");
}
private void checkNotNull(String s)
{

159
jetty-server/src/main/java/org/eclipse/jetty/server/session/HouseKeeper.java
View File

@ -44,7 +44,8 @@ public class HouseKeeper extends AbstractLifeCycle
protected Scheduler.Task _task; //scavenge task
protected Runner _runner;
protected boolean _ownScheduler = false;
private long _intervalMs = DEFAULT_PERIOD_MS;
private long _intervalMs = 0;
@ -93,27 +94,86 @@ public class HouseKeeper extends AbstractLifeCycle
if (_sessionIdManager == null)
throw new IllegalStateException ("No SessionIdManager for Housekeeper");
if (_sessionIdManager instanceof DefaultSessionIdManager)
{
//try and use a common scheduler, fallback to own
_scheduler = ((DefaultSessionIdManager)_sessionIdManager).getServer().getBean(Scheduler.class);
}
if (_scheduler == null)
{
_scheduler = new ScheduledExecutorScheduler();
_ownScheduler = true;
_scheduler.start();
}
else if (!_scheduler.isStarted())
throw new IllegalStateException("Shared scheduler not started");
setIntervalSec(getIntervalSec());
super.doStart();
}
/**
* Get a scheduler. First try a common scheduler, failing that
* create our own.
*
* @throws Exception
*/
protected void findScheduler () throws Exception
{
if (_scheduler == null)
{
if (_sessionIdManager instanceof DefaultSessionIdManager)
{
//try and use a common scheduler, fallback to own
_scheduler = ((DefaultSessionIdManager)_sessionIdManager).getServer().getBean(Scheduler.class);
}
if (_scheduler == null)
{
_scheduler = new ScheduledExecutorScheduler();
_ownScheduler = true;
_scheduler.start();
if (LOG.isDebugEnabled()) LOG.debug("Using own scheduler for scavenging");
}
else if (!_scheduler.isStarted())
throw new IllegalStateException("Shared scheduler not started");
}
}
/**
* If scavenging is not scheduled, schedule it.
* @throws Exception
*/
protected void startScavenging() throws Exception
{
synchronized (this)
{
if (_scheduler != null)
{
//cancel any previous task
if (_task!=null)
_task.cancel();
if (_runner == null)
_runner = new Runner();
LOG.info("Scavenging every {}ms", _intervalMs);
_task = _scheduler.schedule(_runner,_intervalMs,TimeUnit.MILLISECONDS);
}
}
}
/**
* If scavenging is scheduled, stop it.
*
* @throws Exception
*/
protected void stopScavenging() throws Exception
{
synchronized (this)
{
if (_task!=null)
{
_task.cancel();
LOG.info("Stopped scavenging");
}
_task = null;
if (_ownScheduler)
{
_scheduler.stop();
_scheduler = null;
}
}
_runner = null;
}
/**
* @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStop()
*/
@ -122,13 +182,8 @@ public class HouseKeeper extends AbstractLifeCycle
{
synchronized(this)
{
if (_task != null)
_task.cancel();
_task=null;
if (_ownScheduler && _scheduler !=null)
_scheduler.stop();
stopScavenging();
_scheduler = null;
_runner = null;
}
super.doStop();
}
@ -137,37 +192,43 @@ public class HouseKeeper extends AbstractLifeCycle
/**
* Set the period between scavenge cycles
* @param sec the interval (in seconds)
* @throws Exception
*/
public void setIntervalSec (long sec)
public void setIntervalSec (long sec) throws Exception
{
if (sec<=0)
sec=60;
long old_period=_intervalMs;
long period=sec*1000L;
_intervalMs=period;
//add a bit of variability into the scavenge time so that not all
//nodes with the same scavenge interval sync up
long tenPercent = _intervalMs/10;
if ((System.currentTimeMillis()%2) == 0)
_intervalMs += tenPercent;
if (LOG.isDebugEnabled())
LOG.debug("Scavenging every "+_intervalMs+" ms");
synchronized (this)
if (isStarted() || isStarting())
{
if (_scheduler != null && (period!=old_period || _task==null))
if (sec <= 0)
{
if (_task!=null)
_task.cancel();
if (_runner == null)
_runner = new Runner();
_task = _scheduler.schedule(_runner,_intervalMs,TimeUnit.MILLISECONDS);
_intervalMs = 0L;
LOG.info("Scavenging disabled");
stopScavenging();
}
else
{
if (sec < 10)
LOG.warn("Short interval of {}sec for session scavenging.", sec);
_intervalMs=sec*1000L;
//add a bit of variability into the scavenge time so that not all
//nodes with the same scavenge interval sync up
long tenPercent = _intervalMs/10;
if ((System.currentTimeMillis()%2) == 0)
_intervalMs += tenPercent;
if (isStarting() || isStarted())
{
findScheduler();
startScavenging();
}
}
}
else
{
_intervalMs=sec*1000L;
}
}
@ -183,6 +244,8 @@ public class HouseKeeper extends AbstractLifeCycle
}
/**
* Periodically do session housekeeping

12
jetty-server/src/main/java/org/eclipse/jetty/server/session/NullSessionCache.java
View File

@ -37,6 +37,7 @@ public class NullSessionCache extends AbstractSessionCache
public NullSessionCache(SessionHandler handler)
{
super(handler);
super.setEvictionPolicy(EVICT_ON_SESSION_EXIT);
}
/**
@ -104,4 +105,15 @@ public class NullSessionCache extends AbstractSessionCache
return null;
}
/**
* @see org.eclipse.jetty.server.session.AbstractSessionCache#setEvictionPolicy(int)
*/
@Override
public void setEvictionPolicy(int evictionTimeout)
{
LOG.warn("Ignoring eviction setting:"+evictionTimeout);
}
}

2
tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ClientCrossContextSessionTest.java
View File

@ -42,7 +42,7 @@ public class ClientCrossContextSessionTest extends AbstractClientCrossContextSes
@Override
public AbstractTestServer createServer(final int port, final int max, final int scavenge, final int evictionPolicy)
public AbstractTestServer createServer(final int port, final int max, final int scavenge, final int evictionPolicy) throws Exception
{
return new FileTestServer(port,max,scavenge, evictionPolicy);
}

2
tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/FileTestServer.java
View File

@ -122,7 +122,7 @@ public class FileTestServer extends AbstractTestServer
public FileTestServer(int port, int maxInactivePeriod, int scavengePeriod, int idlePassivatePeriod)
public FileTestServer(int port, int maxInactivePeriod, int scavengePeriod, int idlePassivatePeriod) throws Exception
{
super(port, maxInactivePeriod, scavengePeriod, idlePassivatePeriod);
}

2
tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ForwardedSessionTest.java
View File

@ -45,7 +45,7 @@ public class ForwardedSessionTest extends AbstractForwardedSessionTest
@Override
public AbstractTestServer createServer(final int port, final int max, final int scavenge, final int evictionPolicy)
public AbstractTestServer createServer(final int port, final int max, final int scavenge, final int evictionPolicy) throws Exception
{
return new FileTestServer(port,max,scavenge, evictionPolicy);
}

2
tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/IdleSessionTest.java
View File

@ -47,7 +47,7 @@ public class IdleSessionTest extends AbstractIdleSessionTest
* @see org.eclipse.jetty.server.session.AbstractIdleSessionTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(final int port, final int max, final int scavenge, final int evictionPolicy)
public AbstractTestServer createServer(final int port, final int max, final int scavenge, final int evictionPolicy) throws Exception
{
return new FileTestServer(port,max,scavenge, evictionPolicy);
}

2
tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ImmediateSaveTest.java
View File

@ -43,7 +43,7 @@ public class ImmediateSaveTest extends AbstractImmediateSaveTest
}
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{ return new FileTestServer(port, max, scavenge, evictionPolicy)
{
public SessionHandler newSessionHandler()

2
tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ImmortalSessionTest.java
View File

@ -37,7 +37,7 @@ public class ImmortalSessionTest extends AbstractImmortalSessionTest
@Override
public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) throws Exception
{
return new FileTestServer(port,max,scavenge, evictionPolicy);
}

2
tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/NewSessionTest.java
View File

@ -40,7 +40,7 @@ public class NewSessionTest extends AbstractNewSessionTest
FileTestServer.teardown();
}
public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) throws Exception
{
return new FileTestServer(port,max,scavenge,evictionPolicy);
}

2
tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/OrphanedSessionTest.java
View File

@ -39,7 +39,7 @@ public class OrphanedSessionTest extends AbstractOrphanedSessionTest
FileTestServer.teardown();
}
public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) throws Exception
{
return new FileTestServer(port,max,scavenge,evictionPolicy);
}

2
tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ProxySerializationTest.java
View File

@ -50,7 +50,7 @@ public class ProxySerializationTest extends AbstractProxySerializationTest
* @see org.eclipse.jetty.server.session.AbstractProxySerializationTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy )
public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy ) throws Exception
{
return new FileTestServer(port,max,scavenge, evictionPolicy);
}

2
tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ReentrantRequestSessionTest.java
View File

@ -41,7 +41,7 @@ public class ReentrantRequestSessionTest extends AbstractReentrantRequestSession
}
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new FileTestServer(port, max, scavenge, evictionPolicy);
}

2
tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/RemoveSessionTest.java
View File

@ -38,7 +38,7 @@ public class RemoveSessionTest extends AbstractRemoveSessionTest
}
public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) throws Exception
{
return new FileTestServer(port,max,scavenge,evictionPolicy);
}

2
tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ScatterGunLoadTest.java
View File

@ -43,7 +43,7 @@ public class ScatterGunLoadTest extends AbstractScatterGunLoadTest
@Override
public AbstractTestServer createServer(final int port, final int max, final int scavenge, final int evictionPolicy)
public AbstractTestServer createServer(final int port, final int max, final int scavenge, final int evictionPolicy) throws Exception
{
return new FileTestServer(port,max,scavenge, evictionPolicy);
}

2
tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/ServerCrossContextSessionTest.java
View File

@ -40,7 +40,7 @@ public class ServerCrossContextSessionTest extends AbstractServerCrossContextSes
@Override
public AbstractTestServer createServer(final int port, final int max, final int scavenge, final int evictionPolicy)
public AbstractTestServer createServer(final int port, final int max, final int scavenge, final int evictionPolicy) throws Exception
{
return new FileTestServer(port,max,scavenge, evictionPolicy);
}

2
tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/SessionCookieTest.java
View File

@ -40,7 +40,7 @@ public class SessionCookieTest extends AbstractSessionCookieTest
@Override
public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) throws Exception
{
return new FileTestServer(port, max, scavenge,evictionPolicy);
}

2
tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/SessionInvalidateAndCreateTest.java
View File

@ -38,7 +38,7 @@ public class SessionInvalidateAndCreateTest extends AbstractSessionInvalidateAnd
}
@Override
public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) throws Exception
{
return new FileTestServer(port,max,scavenge,evictionPolicy);
}

2
tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/SessionRenewTest.java
View File

@ -40,7 +40,7 @@ public class SessionRenewTest extends AbstractSessionRenewTest
}
@Override
public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) throws Exception
{
return new FileTestServer(port, max, scavenge,evictionPolicy);
}

2
tests/test-sessions/test-file-sessions/src/test/java/org/eclipse/jetty/server/session/SessionValueSharedSaving.java
View File

@ -38,7 +38,7 @@ public class SessionValueSharedSaving extends AbstractSessionValueSavingTest
@Override
public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) throws Exception
{
return new FileTestServer(port,max,scavenge,evictionPolicy);
}

2
tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClientCrossContextSessionTest.java
View File

@ -41,7 +41,7 @@ public class ClientCrossContextSessionTest extends AbstractClientCrossContextSes
}
@Override
public AbstractTestServer createServer(int port, int maxInactiveMs, int scavengeMs,int evictionPolicy)
public AbstractTestServer createServer(int port, int maxInactiveMs, int scavengeMs,int evictionPolicy) throws Exception
{
return new GCloudTestServer(port, maxInactiveMs, scavengeMs, evictionPolicy);
}

2
tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ForwardedSessionTest.java
View File

@ -41,7 +41,7 @@ public class ForwardedSessionTest extends AbstractForwardedSessionTest
@Override
public AbstractTestServer createServer(int port, int maxInactiveMs, int scavengeMs,int evictionPolicy)
public AbstractTestServer createServer(int port, int maxInactiveMs, int scavengeMs,int evictionPolicy) throws Exception
{
return new GCloudTestServer(port, maxInactiveMs, scavengeMs, evictionPolicy);
}

3
tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudTestServer.java
View File

@ -36,8 +36,9 @@ public class GCloudTestServer extends AbstractTestServer
* @param maxInactivePeriod
* @param scavengePeriod
* @param evictionPolicy
* @throws Exception TODO
*/
public GCloudTestServer(int port, int maxInactivePeriod, int scavengePeriod, int evictionPolicy)
public GCloudTestServer(int port, int maxInactivePeriod, int scavengePeriod, int evictionPolicy) throws Exception
{
super(port, maxInactivePeriod, scavengePeriod, evictionPolicy);
}

2
tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ImmediateSaveTest.java
View File

@ -46,7 +46,7 @@ public class ImmediateSaveTest extends AbstractImmediateSaveTest
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new GCloudTestServer(port, max, scavenge, evictionPolicy)
{

2
tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ImmortalSessionTest.java
View File

@ -43,7 +43,7 @@ public class ImmortalSessionTest extends AbstractImmortalSessionTest
* @see org.eclipse.jetty.server.session.AbstractImmortalSessionTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int maxInactiveMs, int scavengeMs,int evictionPolicy)
public AbstractTestServer createServer(int port, int maxInactiveMs, int scavengeMs,int evictionPolicy) throws Exception
{
return new GCloudTestServer(port, maxInactiveMs, scavengeMs, evictionPolicy);
}

2
tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/InvalidationSessionTest.java
View File

@ -45,7 +45,7 @@ public class InvalidationSessionTest extends AbstractInvalidationSessionTest
* @see org.eclipse.jetty.server.session.AbstractInvalidationSessionTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy)
public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) throws Exception
{
GCloudTestServer server = new GCloudTestServer(port, maxInactive, scavengeInterval, evictionPolicy)
{

2
tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/LastAccessTimeTest.java
View File

@ -42,7 +42,7 @@ public class LastAccessTimeTest extends AbstractLastAccessTimeTest
* @see org.eclipse.jetty.server.session.AbstractLastAccessTimeTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) throws Exception
{
return new GCloudTestServer(port, max, scavenge, evictionPolicy);
}

2
tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/LocalSessionScavengingTest.java
View File

@ -43,7 +43,7 @@ public class LocalSessionScavengingTest extends AbstractLocalSessionScavengingTe
* @see org.eclipse.jetty.server.session.AbstractLocalSessionScavengingTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) throws Exception
{
return new GCloudTestServer(port, max, scavenge, evictionPolicy);
}

2
tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/NewSessionTest.java
View File

@ -50,7 +50,7 @@ public class NewSessionTest extends AbstractNewSessionTest
* @see org.eclipse.jetty.server.session.AbstractNewSessionTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) throws Exception
{
return new GCloudTestServer(port, max, scavenge, evictionPolicy);
}

2
tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/OrphanedSessionTest.java
View File

@ -44,7 +44,7 @@ public class OrphanedSessionTest extends AbstractOrphanedSessionTest
* @see org.eclipse.jetty.server.session.AbstractOrphanedSessionTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) throws Exception
{
return new GCloudTestServer(port, max, scavenge, evictionPolicy);
}

2
tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ReentrantRequestSessionTest.java
View File

@ -43,7 +43,7 @@ public class ReentrantRequestSessionTest extends AbstractReentrantRequestSession
* @see org.eclipse.jetty.server.session.AbstractReentrantRequestSessionTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port,int max, int scavengePeriod,int evictionPolicy)
public AbstractTestServer createServer(int port,int max, int scavengePeriod,int evictionPolicy) throws Exception
{
return new GCloudTestServer(port, max, scavengePeriod, evictionPolicy);
}

2
tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/RemoveSessionTest.java
View File

@ -46,7 +46,7 @@ public class RemoveSessionTest extends AbstractRemoveSessionTest
* @see org.eclipse.jetty.server.session.AbstractRemoveSessionTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge,int evictionPolicy) throws Exception
{
return new GCloudTestServer(port, max, scavenge, evictionPolicy);
}

2
tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SameNodeLoadTest.java
View File

@ -44,7 +44,7 @@ public class SameNodeLoadTest extends AbstractSameNodeLoadTest
* @see org.eclipse.jetty.server.session.AbstractSameNodeLoadTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new GCloudTestServer(port, max, scavenge, evictionPolicy);
}

2
tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ServerCrossContextSessionTest.java
View File

@ -39,7 +39,7 @@ public class ServerCrossContextSessionTest extends AbstractServerCrossContextSes
}
@Override
public AbstractTestServer createServer(int port, int maxInactiveMs, int scavengeMs,int evictionPolicy)
public AbstractTestServer createServer(int port, int maxInactiveMs, int scavengeMs,int evictionPolicy) throws Exception
{
return new GCloudTestServer(port, maxInactiveMs, scavengeMs, evictionPolicy);
}

2
tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SessionExpiryTest.java
View File

@ -48,7 +48,7 @@ public class SessionExpiryTest extends AbstractSessionExpiryTest
* @see org.eclipse.jetty.server.session.AbstractSessionExpiryTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new GCloudTestServer(port, max, scavenge, evictionPolicy);
}

2
tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SessionInvalidateAndCreateTest.java
View File

@ -43,7 +43,7 @@ public class SessionInvalidateAndCreateTest extends AbstractSessionInvalidateAnd
* @see org.eclipse.jetty.server.session.AbstractSessionInvalidateAndCreateTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new GCloudTestServer(port, max, scavenge, evictionPolicy);
}

2
tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SessionMigrationTest.java
View File

@ -43,7 +43,7 @@ public class SessionMigrationTest extends AbstractSessionMigrationTest
* @see org.eclipse.jetty.server.session.AbstractSessionMigrationTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int maxInactiveMs, int scavengeMs,int evictionPolicy)
public AbstractTestServer createServer(int port, int maxInactiveMs, int scavengeMs,int evictionPolicy) throws Exception
{
return new GCloudTestServer(port, maxInactiveMs, scavengeMs, evictionPolicy);
}

2
tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SessionRenewTest.java
View File

@ -47,7 +47,7 @@ public class SessionRenewTest extends AbstractSessionRenewTest
* @see org.eclipse.jetty.server.session.AbstractSessionRenewTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new GCloudTestServer(port,max, scavenge, evictionPolicy);
}

2
tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/SessionValueSavingTest.java
View File

@ -42,7 +42,7 @@ public class SessionValueSavingTest extends AbstractSessionValueSavingTest
* @see org.eclipse.jetty.server.session.AbstractSessionValueSavingTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new GCloudTestServer(port, max, scavenge, evictionPolicy);
}

2
tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/StopSessionManagerPreserveSessionTest.java
View File

@ -60,7 +60,7 @@ public class StopSessionManagerPreserveSessionTest extends AbstractStopSessionMa
@Override
public AbstractTestServer createServer(int port, int maxInactiveMs, int scavengeMs,int evictionPolicy)
public AbstractTestServer createServer(int port, int maxInactiveMs, int scavengeMs,int evictionPolicy) throws Exception
{
return new GCloudTestServer(port, maxInactiveMs, scavengeMs, evictionPolicy);
}

2
tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/ClientCrossContextSessionTest.java
View File

@ -37,7 +37,7 @@ public class ClientCrossContextSessionTest extends AbstractClientCrossContextSes
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new HashTestServer(port,max,scavenge,evictionPolicy);
}

2
tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/EvictionFailureTest.java
View File

@ -31,7 +31,7 @@ public class EvictionFailureTest extends AbstractSessionEvictionFailureTest
* @see org.eclipse.jetty.server.session.AbstractTestBase#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy)
public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) throws Exception
{
return new HashTestServer(port, maxInactive, scavengeInterval, evictionPolicy);
}

2
tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/HashTestServer.java
View File

@ -25,7 +25,7 @@ public class HashTestServer extends AbstractTestServer
{
public HashTestServer(int port, int maxInactivePeriod, int scavengePeriod, int evictionPolicy)
public HashTestServer(int port, int maxInactivePeriod, int scavengePeriod, int evictionPolicy) throws Exception
{
super(port, maxInactivePeriod, scavengePeriod, evictionPolicy);
}

2
tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/ImmortalSessionTest.java
View File

@ -22,7 +22,7 @@ public class ImmortalSessionTest extends AbstractImmortalSessionTest
{
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new HashTestServer(port,max,scavenge,evictionPolicy);
}

2
tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/NewSessionTest.java
View File

@ -26,7 +26,7 @@ import org.junit.Test;
public class NewSessionTest extends AbstractNewSessionTest
{
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new HashTestServer(port,max,scavenge,evictionPolicy);
}

2
tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/ReentrantRequestSessionTest.java
View File

@ -30,7 +30,7 @@ public class ReentrantRequestSessionTest extends AbstractReentrantRequestSession
* @see org.eclipse.jetty.server.session.AbstractReentrantRequestSessionTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new HashTestServer(port, max, scavenge, evictionPolicy);
}

2
tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/RemoveSessionTest.java
View File

@ -34,7 +34,7 @@ public class RemoveSessionTest extends AbstractRemoveSessionTest
* @see org.eclipse.jetty.server.session.AbstractRemoveSessionTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new HashTestServer (port, max, scavenge, evictionPolicy);
}

2
tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/ScatterGunLoadTest.java
View File

@ -27,7 +27,7 @@ public class ScatterGunLoadTest extends AbstractScatterGunLoadTest
{
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new HashTestServer(port,max,scavenge,evictionPolicy);
}

2
tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/ServerCrossContextSessionTest.java
View File

@ -23,7 +23,7 @@ import org.junit.Test;
public class ServerCrossContextSessionTest extends AbstractServerCrossContextSessionTest
{
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new HashTestServer(port,max,scavenge,evictionPolicy);
}

2
tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/SessionCookieTest.java
View File

@ -22,7 +22,7 @@ public class SessionCookieTest extends AbstractSessionCookieTest
{
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new HashTestServer(port, max, scavenge, evictionPolicy);
}

2
tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/SessionInvalidateAndCreateTest.java
View File

@ -24,7 +24,7 @@ public class SessionInvalidateAndCreateTest extends AbstractSessionInvalidateAnd
{
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new HashTestServer(port,max,scavenge,evictionPolicy);
}

2
tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/SessionRenewTest.java
View File

@ -31,7 +31,7 @@ public class SessionRenewTest extends AbstractSessionRenewTest
{
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new HashTestServer(port, max, scavenge,evictionPolicy);
}

2
tests/test-sessions/test-hash-sessions/src/test/java/org/eclipse/jetty/server/session/SessionValueSharedSaving.java
View File

@ -22,7 +22,7 @@ public class SessionValueSharedSaving extends AbstractSessionValueSavingTest
{
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new HashTestServer(port,max,scavenge,evictionPolicy);
}

2
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClientCrossContextSessionTest.java
View File

@ -46,7 +46,7 @@ public class ClientCrossContextSessionTest extends AbstractClientCrossContextSes
@Override
public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy) throws Exception
{
return new InfinispanTestSessionServer(port, maxInactiveMs, scavenge, evictionPolicy, __testSupport.getCache());
}

2
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ForwardedSessionTest.java
View File

@ -51,7 +51,7 @@ public class ForwardedSessionTest extends AbstractForwardedSessionTest
@Override
public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy) throws Exception
{
return new InfinispanTestSessionServer(port, maxInactiveMs, scavenge, evictionPolicy, __testSupport.getCache());
}

2
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ImmediateSaveTest.java
View File

@ -47,7 +47,7 @@ public class ImmediateSaveTest extends AbstractImmediateSaveTest
}
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
_server = new InfinispanTestSessionServer(port, max, scavenge, evictionPolicy, __testSupport.getCache())
{

2
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ImmortalSessionTest.java
View File

@ -56,7 +56,7 @@ public class ImmortalSessionTest extends AbstractImmortalSessionTest
* @see org.eclipse.jetty.server.session.AbstractImmortalSessionTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy) throws Exception
{
return new InfinispanTestSessionServer(port, maxInactiveMs, scavenge, evictionPolicy, __testSupport.getCache());
}

2
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/InfinispanTestSessionServer.java
View File

@ -31,7 +31,7 @@ public class InfinispanTestSessionServer extends AbstractTestServer
public InfinispanTestSessionServer(int port, int maxInactivePeriod, int scavengePeriod, int evictionPolicy, BasicCache config)
public InfinispanTestSessionServer(int port, int maxInactivePeriod, int scavengePeriod, int evictionPolicy, BasicCache config) throws Exception
{
super(port, maxInactivePeriod, scavengePeriod, evictionPolicy, config);
}

2
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/LastAccessTimeTest.java
View File

@ -42,7 +42,7 @@ public class LastAccessTimeTest extends AbstractLastAccessTimeTest
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new InfinispanTestSessionServer(port, max, scavenge, evictionPolicy, __testSupport.getCache());
}

2
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/LocalSessionScavengingTest.java
View File

@ -51,7 +51,7 @@ public class LocalSessionScavengingTest extends AbstractLocalSessionScavengingTe
* @see org.eclipse.jetty.server.session.AbstractLocalSessionScavengingTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new InfinispanTestSessionServer(port, max, scavenge, evictionPolicy, __testSupport.getCache());
}

2
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/NewSessionTest.java
View File

@ -50,7 +50,7 @@ public class NewSessionTest extends AbstractNewSessionTest
* @see org.eclipse.jetty.server.session.AbstractNewSessionTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new InfinispanTestSessionServer(port, max, scavenge, evictionPolicy, __testSupport.getCache());
}

2
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ReentrantRequestSessionTest.java
View File

@ -49,7 +49,7 @@ public class ReentrantRequestSessionTest extends AbstractReentrantRequestSession
* @see org.eclipse.jetty.server.session.AbstractReentrantRequestSessionTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port,int maxInactive, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port,int maxInactive, int scavenge, int evictionPolicy) throws Exception
{
return new InfinispanTestSessionServer(port, maxInactive, scavenge, evictionPolicy, __testSupport.getCache());
}

2
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/RemoveSessionTest.java
View File

@ -43,7 +43,7 @@ public class RemoveSessionTest extends AbstractRemoveSessionTest
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
InfinispanTestSessionServer s = new InfinispanTestSessionServer(port, max, scavenge, evictionPolicy, __testSupport.getCache());
return s;

2
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/SameNodeLoadTest.java
View File

@ -51,7 +51,7 @@ public class SameNodeLoadTest extends AbstractSameNodeLoadTest
* @see org.eclipse.jetty.server.session.AbstractSameNodeLoadTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port,int maxInactive, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port,int maxInactive, int scavenge, int evictionPolicy) throws Exception
{
InfinispanTestSessionServer server = new InfinispanTestSessionServer(port,maxInactive, scavenge, evictionPolicy, __testSupport.getCache());
return server;

2
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/SessionExpiryTest.java
View File

@ -42,7 +42,7 @@ public class SessionExpiryTest extends AbstractSessionExpiryTest
}
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
InfinispanTestSessionServer server = new InfinispanTestSessionServer(port, max, scavenge, evictionPolicy, __testSupport.getCache());
return server;

2
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/SessionInvalidateAndCreateTest.java
View File

@ -50,7 +50,7 @@ public class SessionInvalidateAndCreateTest extends AbstractSessionInvalidateAnd
* @see org.eclipse.jetty.server.session.AbstractSessionInvalidateAndCreateTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new InfinispanTestSessionServer(port, max, scavenge, evictionPolicy, __testSupport.getCache());
}

2
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/SessionMigrationTest.java
View File

@ -48,7 +48,7 @@ public class SessionMigrationTest extends AbstractSessionMigrationTest
@Override
public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy) throws Exception
{
return new InfinispanTestSessionServer(port, maxInactiveMs, scavenge, evictionPolicy, __testSupport.getCache());
}

2
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/SessionRenewTest.java
View File

@ -57,7 +57,7 @@ public class SessionRenewTest extends AbstractSessionRenewTest
* @see org.eclipse.jetty.server.session.AbstractSessionRenewTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new InfinispanTestSessionServer(port, max, scavenge, evictionPolicy, __testSupport.getCache());
}

2
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteClientCrossContextSessionTest.java
View File

@ -55,7 +55,7 @@ public class RemoteClientCrossContextSessionTest extends AbstractClientCrossCont
@Override
public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy) throws Exception
{
return new InfinispanTestSessionServer(port, maxInactiveMs, scavenge, evictionPolicy, __testSupport.getCache());
}

2
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteForwardedSessionTest.java
View File

@ -53,7 +53,7 @@ public class RemoteForwardedSessionTest extends AbstractForwardedSessionTest
@Override
public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy) throws Exception
{
return new InfinispanTestSessionServer(port, maxInactiveMs, scavenge, evictionPolicy, __testSupport.getCache());
}

2
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteImmediateSaveTest.java
View File

@ -50,7 +50,7 @@ public class RemoteImmediateSaveTest extends AbstractImmediateSaveTest
__testSupport.teardown();
}
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new InfinispanTestSessionServer(port, max, scavenge, evictionPolicy, __testSupport.getCache())
{

2
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteImmortalSessionTest.java
View File

@ -59,7 +59,7 @@ public class RemoteImmortalSessionTest extends AbstractImmortalSessionTest
* @see org.eclipse.jetty.server.session.AbstractImmortalSessionTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy) throws Exception
{
return new InfinispanTestSessionServer(port, maxInactiveMs, scavenge, evictionPolicy, __testSupport.getCache());
}

2
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteInvalidationSessionTest.java
View File

@ -56,7 +56,7 @@ public class RemoteInvalidationSessionTest extends AbstractInvalidationSessionTe
* @see org.eclipse.jetty.server.session.AbstractInvalidationSessionTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int maxInterval, int scavengeInterval, int evictionPolicy)
public AbstractTestServer createServer(int port, int maxInterval, int scavengeInterval, int evictionPolicy) throws Exception
{
return new InfinispanTestSessionServer(port, maxInterval, scavengeInterval, evictionPolicy, __testSupport.getCache());
}

2
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteLastAccessTimeTest.java
View File

@ -52,7 +52,7 @@ public class RemoteLastAccessTimeTest extends AbstractLastAccessTimeTest
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new InfinispanTestSessionServer(port, max, scavenge, evictionPolicy, __testSupport.getCache());
}

2
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteLocalSessionScavengingTest.java
View File

@ -53,7 +53,7 @@ public class RemoteLocalSessionScavengingTest extends AbstractLocalSessionScaven
* @see org.eclipse.jetty.server.session.AbstractLocalSessionScavengingTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new InfinispanTestSessionServer(port, max, scavenge, evictionPolicy, __testSupport.getCache());
}

2
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteNewSessionTest.java
View File

@ -53,7 +53,7 @@ public class RemoteNewSessionTest extends AbstractNewSessionTest
* @see org.eclipse.jetty.server.session.AbstractNewSessionTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new InfinispanTestSessionServer(port, max, scavenge, evictionPolicy, __testSupport.getCache());
}

2
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteReentrantRequestSessionTest.java
View File

@ -52,7 +52,7 @@ public class RemoteReentrantRequestSessionTest extends AbstractReentrantRequestS
* @see org.eclipse.jetty.server.session.AbstractReentrantRequestSessionTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int maxInactive, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int maxInactive, int scavenge, int evictionPolicy) throws Exception
{
return new InfinispanTestSessionServer(port, maxInactive, scavenge, evictionPolicy, __testSupport.getCache());
}

2
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteRemoveSessionTest.java
View File

@ -46,7 +46,7 @@ public class RemoteRemoveSessionTest extends AbstractRemoveSessionTest
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
InfinispanTestSessionServer s = new InfinispanTestSessionServer(port, max, scavenge,evictionPolicy, __testSupport.getCache());
return s;

2
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteSameNodeLoadTest.java
View File

@ -54,7 +54,7 @@ public class RemoteSameNodeLoadTest extends AbstractSameNodeLoadTest
* @see org.eclipse.jetty.server.session.AbstractSameNodeLoadTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int maxInactive, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int maxInactive, int scavenge, int evictionPolicy) throws Exception
{
InfinispanTestSessionServer server = new InfinispanTestSessionServer(port, maxInactive, scavenge,evictionPolicy, __testSupport.getCache());
return server;

2
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteSessionExpiryTest.java
View File

@ -45,7 +45,7 @@ public class RemoteSessionExpiryTest extends AbstractSessionExpiryTest
}
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
InfinispanTestSessionServer server = new InfinispanTestSessionServer(port, max, scavenge, evictionPolicy, __testSupport.getCache());
return server;

2
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteSessionInvalidateAndCreateTest.java
View File

@ -53,7 +53,7 @@ public class RemoteSessionInvalidateAndCreateTest extends AbstractSessionInvalid
* @see org.eclipse.jetty.server.session.AbstractSessionInvalidateAndCreateTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new InfinispanTestSessionServer(port, max, scavenge, evictionPolicy, __testSupport.getCache());
}

2
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteSessionMigrationTest.java
View File

@ -51,7 +51,7 @@ public class RemoteSessionMigrationTest extends AbstractSessionMigrationTest
@Override
public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int maxInactiveMs, int scavenge, int evictionPolicy) throws Exception
{
return new InfinispanTestSessionServer(port, maxInactiveMs, scavenge, evictionPolicy, __testSupport.getCache());
}

2
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteSessionRenewTest.java
View File

@ -56,7 +56,7 @@ public class RemoteSessionRenewTest extends AbstractSessionRenewTest
* @see org.eclipse.jetty.server.session.AbstractSessionRenewTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new InfinispanTestSessionServer(port, max, scavenge, evictionPolicy, __testSupport.getCache());
}

2
tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ClientCrossContextSessionTest.java
View File

@ -31,7 +31,7 @@ public class ClientCrossContextSessionTest extends AbstractClientCrossContextSes
{
@Override
public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy)
public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) throws Exception
{
return new JdbcTestServer(port, maxInactive, scavengeInterval, evictionPolicy);
}

2
tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ForwardedSessionTest.java
View File

@ -31,7 +31,7 @@ public class ForwardedSessionTest extends AbstractForwardedSessionTest
{
@Override
public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy)
public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) throws Exception
{
return new JdbcTestServer(port, maxInactive, scavengeInterval, evictionPolicy);
}

2
tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ImmediateSaveTest.java
View File

@ -39,7 +39,7 @@ public class ImmediateSaveTest extends AbstractImmediateSaveTest
}
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
_server = new JdbcTestServer(port, max, scavenge, evictionPolicy)
{

2
tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ImmortalSessionTest.java
View File

@ -29,7 +29,7 @@ import org.junit.Test;
public class ImmortalSessionTest extends AbstractImmortalSessionTest
{
public AbstractTestServer createServer(int port, int maxInactiveMs, int scavengeMs, int evictionPolicy)
public AbstractTestServer createServer(int port, int maxInactiveMs, int scavengeMs, int evictionPolicy) throws Exception
{
return new JdbcTestServer(port, maxInactiveMs, scavengeMs, evictionPolicy);
}

2
tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/InvalidationSessionTest.java
View File

@ -28,7 +28,7 @@ import org.junit.Test;
public class InvalidationSessionTest extends AbstractInvalidationSessionTest
{
public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy)
public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) throws Exception
{
return new JdbcTestServer(port, maxInactive, scavengeInterval, evictionPolicy);
}

4
tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestServer.java
View File

@ -79,12 +79,12 @@ public class JdbcTestServer extends AbstractTestServer
}
public JdbcTestServer(int port, int maxInactivePeriod, int scavengePeriod, int idlePassivatePeriod, String connectionUrl)
public JdbcTestServer(int port, int maxInactivePeriod, int scavengePeriod, int idlePassivatePeriod, String connectionUrl) throws Exception
{
super(port, maxInactivePeriod, scavengePeriod, idlePassivatePeriod);
}
public JdbcTestServer(int port, int maxInactivePeriod, int scavengePeriod, int idlePassivatePeriod)
public JdbcTestServer(int port, int maxInactivePeriod, int scavengePeriod, int idlePassivatePeriod) throws Exception
{
super(port, maxInactivePeriod, scavengePeriod, idlePassivatePeriod);
}

2
tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/LastAccessTimeTest.java
View File

@ -26,7 +26,7 @@ import org.junit.Test;
*/
public class LastAccessTimeTest extends AbstractLastAccessTimeTest
{
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new JdbcTestServer(port,max,scavenge, evictionPolicy);
}

9
tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/LocalSessionScavengingTest.java
View File

@ -43,11 +43,18 @@ public class LocalSessionScavengingTest extends AbstractLocalSessionScavengingTe
}
}
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new JdbcTestServer(port,max,scavenge, evictionPolicy);
}
@Test
public void testNoScavenging() throws Exception
{
super.testNoScavenging();
}
@Test
public void testLocalSessionsScavenging() throws Exception
{

2
tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/NewSessionTest.java
View File

@ -29,7 +29,7 @@ public class NewSessionTest extends AbstractNewSessionTest
/**
* @see org.eclipse.jetty.server.session.AbstractNewSessionTest#createServer(int, int, int, int)
*/
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new JdbcTestServer(port,max,scavenge, evictionPolicy);
}

2
tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/OrphanedSessionTest.java
View File

@ -26,7 +26,7 @@ import org.junit.Test;
*/
public class OrphanedSessionTest extends AbstractOrphanedSessionTest
{
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new JdbcTestServer(port,max,scavenge,evictionPolicy);
}

2
tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ProxySerializationTest.java
View File

@ -35,7 +35,7 @@ public class ProxySerializationTest extends AbstractProxySerializationTest
* @see org.eclipse.jetty.server.session.AbstractProxySerializationTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new JdbcTestServer(port, max, scavenge, evictionPolicy);
}

2
tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ReentrantRequestSessionTest.java
View File

@ -28,7 +28,7 @@ import org.junit.Test;
public class ReentrantRequestSessionTest extends AbstractReentrantRequestSessionTest
{
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new JdbcTestServer(port,max,scavenge,evictionPolicy);
}

2
tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ServerCrossContextSessionTest.java
View File

@ -28,7 +28,7 @@ public class ServerCrossContextSessionTest extends AbstractServerCrossContextSes
{
@Override
public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy)
public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) throws Exception
{
return new JdbcTestServer(port, maxInactive, scavengeInterval, evictionPolicy);
}

2
tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionExpiryTest.java
View File

@ -36,7 +36,7 @@ public class SessionExpiryTest extends AbstractSessionExpiryTest
* @see org.eclipse.jetty.server.session.AbstractSessionExpiryTest#createServer(int, int, int, int)
*/
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new JdbcTestServer(port,max,scavenge, evictionPolicy);
}

2
tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionInvalidateAndCreateTest.java
View File

@ -26,7 +26,7 @@ public class SessionInvalidateAndCreateTest extends AbstractSessionInvalidateAnd
{
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new JdbcTestServer(port,max,scavenge,evictionPolicy);
}

2
tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionMigrationTest.java
View File

@ -28,7 +28,7 @@ public class SessionMigrationTest extends AbstractSessionMigrationTest
{
@Override
public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy)
public AbstractTestServer createServer(int port, int maxInactive, int scavengeInterval, int evictionPolicy) throws Exception
{
return new JdbcTestServer(port, maxInactive, scavengeInterval, evictionPolicy);
}

2
tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionRenewTest.java
View File

@ -30,7 +30,7 @@ public class SessionRenewTest extends AbstractSessionRenewTest
{
@Override
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy)
public AbstractTestServer createServer(int port, int max, int scavenge, int evictionPolicy) throws Exception
{
return new JdbcTestServer(port, max, scavenge, evictionPolicy);
}

Some files were not shown because too many files have changed in this diff Show More