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

Merge remote-tracking branch 'origin/jetty-9.4.x'

This commit is contained in:
Jan Bartel 2016-06-16 15:28:57 +10:00
parent a098b587bc bb73aea67b
commit 552fea5f99
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod
View File

@ -10,7 +10,7 @@ maven://org.slf4j/slf4j-api/1.6.6|lib/xmemcached/slf4j-api-1.6.6.jar
[lib]
lib/jetty-memcached-sessions-${jetty.version}.jar
lib/xmemcached
lib/xmemcached/*.jar
[license]
Xmemcached is an open source project hosted on Github and released under the Apache 2.0 license.

4
jetty-memcached/jetty-memcached-sessions/src/main/java/org/eclipse/jetty/memcached/session/MemcachedSessionDataMap.java
View File

@ -46,8 +46,8 @@ public class MemcachedSessionDataMap implements SessionDataMap
/**
* @param host
* @param port
* @param host address of memcache server
* @param port address of memcache server
*/
public MemcachedSessionDataMap(String host, String port)
{

6
jetty-server/src/main/config/etc/sessions/session-data-cache/session-caching-store.xml
View File

@ -8,7 +8,9 @@
<!-- ===================================================================== -->
<Call name="removeBean">
<Ref id="sessionDataStoreFactory"/>
<Arg>
<Ref id="sessionDataStoreFactory"/>
</Arg>
</Call>
@ -17,7 +19,7 @@
<Arg>
<New class="org.eclipse.jetty.server.session.CachingSessionDataStoreFactory">
<Set name="sessionStoreFactory"><Ref id="sessionDataStoreFactory"/></Set>
<Set name="sessionDataMapFactory"><Ref id="sessionDataMapFatory"/></Set>
<Set name="sessionDataMapFactory"><Ref id="sessionDataMapFactory"/></Set>
</New>
</Arg>
</Call>

6
jetty-server/src/main/java/org/eclipse/jetty/server/session/CachingSessionDataStore.java
View File

@ -21,7 +21,7 @@ package org.eclipse.jetty.server.session;
import java.util.Set;
import org.eclipse.jetty.util.component.AbstractLifeCycle;
import org.eclipse.jetty.util.component.ContainerLifeCycle;
/**
* CachingSessionDataStore
@ -42,7 +42,7 @@ import org.eclipse.jetty.util.component.AbstractLifeCycle;
* possible that failures can result in cache inconsistency.
*
*/
public class CachingSessionDataStore extends AbstractLifeCycle implements SessionDataStore
public class CachingSessionDataStore extends ContainerLifeCycle implements SessionDataStore
{
/**
@ -64,7 +64,9 @@ public class CachingSessionDataStore extends AbstractLifeCycle implements Sessio
public CachingSessionDataStore (SessionDataMap cache, SessionDataStore store)
{
_cache = cache;
addBean(_cache,true);
_store = store;
addBean(_store,true);
}