Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 998C9200CBF for ; Fri, 23 Jun 2017 21:04:59 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 98761160BE5; Fri, 23 Jun 2017 19:04:59 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id BACEF160BE2 for ; Fri, 23 Jun 2017 21:04:58 +0200 (CEST) Received: (qmail 40985 invoked by uid 500); 23 Jun 2017 19:04:58 -0000 Mailing-List: contact notifications-help@freemarker.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@freemarker.incubator.apache.org Delivered-To: mailing list notifications@freemarker.incubator.apache.org Received: (qmail 40968 invoked by uid 99); 23 Jun 2017 19:04:57 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Jun 2017 19:04:57 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 0B7F4C1471 for ; Fri, 23 Jun 2017 19:04:57 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.722 X-Spam-Level: X-Spam-Status: No, score=-3.722 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_NUMSUBJECT=0.5, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id ND2EtknwbBQu for ; Fri, 23 Jun 2017 19:04:55 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 7F7785FB7F for ; Fri, 23 Jun 2017 19:04:54 +0000 (UTC) Received: (qmail 40946 invoked by uid 99); 23 Jun 2017 19:04:53 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Jun 2017 19:04:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4DE15DFC25; Fri, 23 Jun 2017 19:04:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ddekany@apache.org To: notifications@freemarker.incubator.apache.org Date: Fri, 23 Jun 2017 19:04:53 -0000 Message-Id: <5d8c89155aec42dea6f020a8591558cf@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-freemarker git commit: Fixed MruCacheStorage concurrency bug introduced in FM3 archived-at: Fri, 23 Jun 2017 19:04:59 -0000 Repository: incubator-freemarker Updated Branches: refs/heads/3 492fa2085 -> e97f6ba21 Fixed MruCacheStorage concurrency bug introduced in FM3 Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/d732b3c0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/d732b3c0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/d732b3c0 Branch: refs/heads/3 Commit: d732b3c078dfe8308c66f37b853571df2b3c6963 Parents: 492fa20 Author: ddekany Authored: Fri Jun 23 21:03:43 2017 +0200 Committer: ddekany Committed: Fri Jun 23 21:03:43 2017 +0200 ---------------------------------------------------------------------- .../freemarker/core/templateresolver/impl/MruCacheStorage.java | 6 +++--- .../core/templateresolver/impl/SoftCacheStorage.java | 2 +- .../core/templateresolver/impl/StrongCacheStorage.java | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/d732b3c0/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/MruCacheStorage.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/MruCacheStorage.java b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/MruCacheStorage.java index f86e746..7d5e52b 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/MruCacheStorage.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/MruCacheStorage.java @@ -86,7 +86,7 @@ public class MruCacheStorage implements CacheStorageWithGetSize { } @Override - public Object get(Object key) { + public synchronized Object get(Object key) { removeClearedReferences(); MruEntry entry = (MruEntry) map.get(key); if (entry == null) { @@ -102,7 +102,7 @@ public class MruCacheStorage implements CacheStorageWithGetSize { } @Override - public void put(Object key, Object value) { + public synchronized void put(Object key, Object value) { removeClearedReferences(); MruEntry entry = (MruEntry) map.get(key); if (entry == null) { @@ -116,7 +116,7 @@ public class MruCacheStorage implements CacheStorageWithGetSize { } @Override - public void remove(Object key) { + public synchronized void remove(Object key) { removeClearedReferences(); removeInternal(key); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/d732b3c0/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/SoftCacheStorage.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/SoftCacheStorage.java b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/SoftCacheStorage.java index 2cbaf33..b276a9e 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/SoftCacheStorage.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/SoftCacheStorage.java @@ -37,7 +37,7 @@ import org.apache.freemarker.core.templateresolver.CacheStorageWithGetSize; * * @see ExtendableBuilder#setTemplateCacheStorage(CacheStorage) */ -public class SoftCacheStorage implements CacheStorage, CacheStorageWithGetSize { +public class SoftCacheStorage implements CacheStorageWithGetSize { private final ReferenceQueue queue = new ReferenceQueue(); private final ConcurrentMap map; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/d732b3c0/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/StrongCacheStorage.java ---------------------------------------------------------------------- diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/StrongCacheStorage.java b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/StrongCacheStorage.java index bef7142..f99bd98 100644 --- a/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/StrongCacheStorage.java +++ b/freemarker-core/src/main/java/org/apache/freemarker/core/templateresolver/impl/StrongCacheStorage.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.templateresolver.CacheStorage; import org.apache.freemarker.core.templateresolver.CacheStorageWithGetSize; /** @@ -34,7 +33,7 @@ import org.apache.freemarker.core.templateresolver.CacheStorageWithGetSize; * * @see Configuration#getTemplateCacheStorage() */ -public class StrongCacheStorage implements CacheStorage, CacheStorageWithGetSize { +public class StrongCacheStorage implements CacheStorageWithGetSize { private final ConcurrentMap map = new ConcurrentHashMap();