Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 81DD317F91 for ; Tue, 24 Feb 2015 14:10:47 +0000 (UTC) Received: (qmail 94973 invoked by uid 500); 24 Feb 2015 14:10:47 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 94935 invoked by uid 500); 24 Feb 2015 14:10:47 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 94877 invoked by uid 99); 24 Feb 2015 14:10:47 -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; Tue, 24 Feb 2015 14:10:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EEA8AE08ED; Tue, 24 Feb 2015 14:10:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: benedict@apache.org To: commits@cassandra.apache.org Date: Tue, 24 Feb 2015 14:10:46 -0000 Message-Id: <30057f6132774bfb811c7c1c9bd4cb00@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] cassandra git commit: ninja log deallocate in Ref.ensureReleased() Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 0a7f50876 -> 766d8c010 refs/heads/trunk b944f0d66 -> ec2c050ba ninja log deallocate in Ref.ensureReleased() Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/766d8c01 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/766d8c01 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/766d8c01 Branch: refs/heads/cassandra-2.1 Commit: 766d8c01033bfe0f1f9713e129fe07d157874fec Parents: 0a7f508 Author: Benedict Elliott Smith Authored: Tue Feb 24 14:10:25 2015 +0000 Committer: Benedict Elliott Smith Committed: Tue Feb 24 14:10:25 2015 +0000 ---------------------------------------------------------------------- src/java/org/apache/cassandra/utils/concurrent/Ref.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/766d8c01/src/java/org/apache/cassandra/utils/concurrent/Ref.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/concurrent/Ref.java b/src/java/org/apache/cassandra/utils/concurrent/Ref.java index dd04051..8213c46 100644 --- a/src/java/org/apache/cassandra/utils/concurrent/Ref.java +++ b/src/java/org/apache/cassandra/utils/concurrent/Ref.java @@ -153,7 +153,11 @@ public final class Ref implements RefCounted, AutoCloseable void ensureReleased() { if (releasedUpdater.getAndSet(this, 1) == 0) + { globalState.release(this); + if (DEBUG_ENABLED) + debug.deallocate(); + } } void release(boolean leak)