From commits-return-50098-archive-asf-public=cust-asf.ponee.io@activemq.apache.org Tue Jan 9 16:26:39 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 1C7DD180718 for ; Tue, 9 Jan 2018 16:26:39 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 0C752160C2D; Tue, 9 Jan 2018 15:26:39 +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 541B8160C13 for ; Tue, 9 Jan 2018 16:26:38 +0100 (CET) Received: (qmail 98675 invoked by uid 500); 9 Jan 2018 15:26:37 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 98665 invoked by uid 99); 9 Jan 2018 15:26:37 -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, 09 Jan 2018 15:26:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 46D10DFC32; Tue, 9 Jan 2018 15:26:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: michaelpearce@apache.org To: commits@activemq.apache.org Date: Tue, 09 Jan 2018 15:26:37 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] activemq-artemis git commit: ARTEMIS-1593 RemotingConnectionImpl leaks Repository: activemq-artemis Updated Branches: refs/heads/master 38df11d1d -> d3d7eb7db ARTEMIS-1593 RemotingConnectionImpl leaks FileNameKey was holding a reference to PropertiesLoader.this due to its inner class definition, causing RemotingConnectionImpl to leak through a long chain of dependencies rooted in a PropertiesLoader's subclass property ie PropertiesLoaderModule::callbackHandler. FileNameKey is turned into a inner static class to break this hidden dependency. Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/e360f85c Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/e360f85c Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/e360f85c Branch: refs/heads/master Commit: e360f85c1b06bcfcc0664e1123f9dc93484a21e0 Parents: 38df11d Author: Francesco Nigro Authored: Tue Jan 9 15:12:44 2018 +0100 Committer: Michael Pearce Committed: Tue Jan 9 15:26:11 2018 +0000 ---------------------------------------------------------------------- .../activemq/artemis/spi/core/security/jaas/PropertiesLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e360f85c/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/PropertiesLoader.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/PropertiesLoader.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/PropertiesLoader.java index 616bb82..8f3d7aa 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/PropertiesLoader.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/PropertiesLoader.java @@ -56,7 +56,7 @@ public class PropertiesLoader { return Boolean.parseBoolean((String) options.get(name)); } - public class FileNameKey { + public static final class FileNameKey { final File file; final String absPath;