diff options
author | Jan Bartel | 2015-12-11 00:42:29 +0000 |
---|---|---|
committer | Jan Bartel | 2015-12-11 00:42:29 +0000 |
commit | 31ea1704a1fdaef6f7d862dfacb905c5ac4728a3 (patch) | |
tree | c44fc7cac5efe7628c95942115d7d42ddb61014e /jetty-gcloud | |
parent | 4793be634ff4a17fe5e7c3c6f34725fe11dec06f (diff) | |
download | org.eclipse.jetty.project-31ea1704a1fdaef6f7d862dfacb905c5ac4728a3.tar.gz org.eclipse.jetty.project-31ea1704a1fdaef6f7d862dfacb905c5ac4728a3.tar.xz org.eclipse.jetty.project-31ea1704a1fdaef6f7d862dfacb905c5ac4728a3.zip |
Make calling passivate/active depend on type of session data store; fix tests
Diffstat (limited to 'jetty-gcloud')
2 files changed, 11 insertions, 5 deletions
diff --git a/jetty-gcloud/gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStore.java b/jetty-gcloud/gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStore.java index 14ed51a4d6..b601d76831 100644 --- a/jetty-gcloud/gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStore.java +++ b/jetty-gcloud/gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStore.java @@ -384,6 +384,15 @@ public class GCloudSessionDataStore extends AbstractSessionDataStore return reference.get(); } + + /** + * @see org.eclipse.jetty.server.session.SessionDataStore#isPassivating() + */ + @Override + public boolean isPassivating() + { + return true; + } } diff --git a/jetty-gcloud/gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionIdManager.java b/jetty-gcloud/gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionIdManager.java index b3157c9114..f290f8137d 100644 --- a/jetty-gcloud/gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionIdManager.java +++ b/jetty-gcloud/gcloud-session-manager/src/main/java/org/eclipse/jetty/gcloud/session/GCloudSessionIdManager.java @@ -45,7 +45,6 @@ public class GCloudSessionIdManager extends AbstractSessionIdManager private final static Logger LOG = Log.getLogger("org.eclipse.jetty.server.session"); public static final int DEFAULT_IDLE_EXPIRY_MULTIPLE = 2; public static final String KIND = "GCloudSessionId"; - private Server _server; private Datastore _datastore; private KeyFactory _keyFactory; private GCloudConfiguration _config; @@ -58,8 +57,7 @@ public class GCloudSessionIdManager extends AbstractSessionIdManager */ public GCloudSessionIdManager(Server server) { - super(); - _server = server; + super(server); } /** @@ -68,8 +66,7 @@ public class GCloudSessionIdManager extends AbstractSessionIdManager */ public GCloudSessionIdManager(Server server, Random random) { - super(random); - _server = server; + super(server,random); } |