This is an automated email from the ASF dual-hosted git repository.
tv pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jcs.git
commit 14e2412291dd88d54fd9a283c9fc9e00f4b6d7fc
Merge: d1f069c f91ce98
Author: Thomas Vandahl <t...@apache.org>
AuthorDate: Mon Mar 29 21:49:28 2021 +0200
Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/commons-jcs.git
commons-jcs-core/pom.xml | 2 +-
.../jcs3/auxiliary/disk/block/BlockDiskCache.java | 4 +---
.../auxiliary/disk/jdbc/JDBCDiskCacheFactory.java | 6 ++----
.../jcs3/auxiliary/lateral/LateralCacheNoWait.java | 8 ++------
.../auxiliary/lateral/LateralCacheNoWaitFacade.java | 4 +---
.../lateral/socket/tcp/LateralTCPCacheFactory.java | 9 ++-------
.../jcs3/auxiliary/remote/RemoteCacheFactory.java | 8 ++------
.../jcs3/auxiliary/remote/RemoteCacheManager.java | 4 +---
.../jcs3/auxiliary/remote/RemoteCacheNoWait.java | 3 +--
.../commons/jcs3/auxiliary/remote/RemoteLocation.java | 3 +--
.../commons/jcs3/auxiliary/remote/RemoteUtils.java | 3 +--
.../remote/http/client/RemoteHttpCacheDispatcher.java | 3 +--
.../remote/http/server/RemoteHttpCacheServlet.java | 5 ++---
.../auxiliary/remote/server/RemoteCacheServer.java | 19 +++++++------------
.../remote/util/RemoteCacheRequestFactory.java | 9 +++------
.../commons/jcs3/engine/CacheWatchRepairable.java | 11 ++++-------
.../jcs3/engine/control/CompositeCacheManager.java | 4 +---
.../jcs3/engine/memory/AbstractMemoryCache.java | 6 +++---
.../commons/jcs3/utils/config/PropertySetter.java | 3 +--
.../utils/serialization/CompressingSerializer.java | 3 +--
.../serialization/SerializationConversionUtil.java | 5 ++---
.../commons/jcs3/utils/struct/AbstractLRUMap.java | 6 ++----
.../commons/jcs3/utils/struct/DoubleLinkedList.java | 3 +--
.../jcs3/utils/threadpool/ThreadPoolManager.java | 15 +++++----------
.../jcs3/jcache/extras/web/InMemoryResponse.java | 6 +-----
.../apache/commons/jcs3/jcache/ExpiryAwareCache.java | 3 ++-
.../java/org/apache/commons/jcs3/jcache/JCSCache.java | 14 +++++++-------
27 files changed, 58 insertions(+), 111 deletions(-)
diff --cc
commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPCacheFactory.java
index 2760d10,e97a1d4..720dbe1
---
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPCacheFactory.java
+++
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPCacheFactory.java
@@@ -275,15 -266,11 +272,13 @@@ public class LateralTCPCacheFactor
{
final String key = ilca.getUdpDiscoveryAddr() + ":" +
ilca.getUdpDiscoveryPort();
- final LateralTCPDiscoveryListener ins =
lTCPDLInstances.computeIfAbsent(key, key1 -> {
+ return lTCPDLInstances.computeIfAbsent(key, key1 -> {
log.info("Created new discovery listener for cacheName {0} for
request {1}",
key1, ilca.getCacheName());
- return new LateralTCPDiscoveryListener( this.getName(),
cacheManager);
+ return new LateralTCPDiscoveryListener( this.getName(),
+ (CompositeCacheManager) cacheManager,
+ cacheEventLogger, elementSerializer);
});
-
- return ins;
}
/**
