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 B8BAF200BF1 for ; Tue, 3 Jan 2017 23:18:41 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id B71E1160B43; Tue, 3 Jan 2017 22:18:41 +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 0E1C7160B20 for ; Tue, 3 Jan 2017 23:18:40 +0100 (CET) Received: (qmail 64372 invoked by uid 500); 3 Jan 2017 22:18:40 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 64363 invoked by uid 99); 3 Jan 2017 22:18:40 -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, 03 Jan 2017 22:18:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2CB63DFBE8; Tue, 3 Jan 2017 22:18:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tabish@apache.org To: commits@qpid.apache.org Message-Id: <4cbf83552de144739b6b1287e0f0d33d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: qpid-jms git commit: QPIDJMS-243 Fix potential NPE on close of resource Date: Tue, 3 Jan 2017 22:18:40 +0000 (UTC) archived-at: Tue, 03 Jan 2017 22:18:41 -0000 Repository: qpid-jms Updated Branches: refs/heads/master 81fc0d9a0 -> 91e1b02ad QPIDJMS-243 Fix potential NPE on close of resource On close of a not fully initialized connection resource it could encounter an NPE because the connection session was not created. Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/91e1b02a Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/91e1b02a Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/91e1b02a Branch: refs/heads/master Commit: 91e1b02ad42fcd734c411cac311fe6da228e1a38 Parents: 81fc0d9 Author: Timothy Bish Authored: Tue Jan 3 17:18:29 2017 -0500 Committer: Timothy Bish Committed: Tue Jan 3 17:18:29 2017 -0500 ---------------------------------------------------------------------- .../java/org/apache/qpid/jms/provider/amqp/AmqpConnection.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/91e1b02a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnection.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnection.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnection.java index e8eebb0..48271bf 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnection.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnection.java @@ -121,7 +121,9 @@ public class AmqpConnection extends AmqpAbstractResource sessionList = new ArrayList<>(sessions.values()); for (AmqpSession session : sessionList) { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org