Return-Path: X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1D923E435 for ; Wed, 6 Feb 2013 15:42:57 +0000 (UTC) Received: (qmail 86549 invoked by uid 500); 6 Feb 2013 15:42:56 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 86432 invoked by uid 500); 6 Feb 2013 15:42:56 -0000 Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: allura-dev@incubator.apache.org Delivered-To: mailing list allura-commits@incubator.apache.org Received: (qmail 85181 invoked by uid 99); 6 Feb 2013 15:42:52 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Feb 2013 15:42:52 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C45BA24122; Wed, 6 Feb 2013 15:42:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: johnsca@apache.org To: allura-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [16/50] git commit: [#4691] Flush after computing LCD for each commit Message-Id: <20130206154252.C45BA24122@tyr.zones.apache.org> Date: Wed, 6 Feb 2013 15:42:52 +0000 (UTC) [#4691] Flush after computing LCD for each commit Signed-off-by: Cory Johns Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/2f32ed1c Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/2f32ed1c Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/2f32ed1c Branch: refs/heads/cj/4691 Commit: 2f32ed1cdb3c26f6188eab42e4d23b4fe959b896 Parents: 73fb34e Author: Cory Johns Authored: Fri Dec 7 17:27:52 2012 +0000 Committer: Tim Van Steenburgh Committed: Tue Feb 5 20:22:50 2013 +0000 ---------------------------------------------------------------------- Allura/allura/model/repo.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2f32ed1c/Allura/allura/model/repo.py ---------------------------------------------------------------------- diff --git a/Allura/allura/model/repo.py b/Allura/allura/model/repo.py index 77b97d2..c89be56 100644 --- a/Allura/allura/model/repo.py +++ b/Allura/allura/model/repo.py @@ -885,7 +885,7 @@ class ModelCache(object): self._cache[cls][key] = val elif len(self._cache[cls]) >= self.max_size: # remove the least-recently-used cache item - instance = self._cache[cls].popitem(last=False) + key, instance = self._cache[cls].popitem(last=False) session(instance).expunge(instance) def size(self):