Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-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 8022410810 for ; Tue, 25 Nov 2014 09:44:35 +0000 (UTC) Received: (qmail 44853 invoked by uid 500); 25 Nov 2014 09:44:35 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 44806 invoked by uid 500); 25 Nov 2014 09:44:35 -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 44797 invoked by uid 99); 25 Nov 2014 09:44:35 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Nov 2014 09:44:35 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2839EA18D04; Tue, 25 Nov 2014 09:44:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dejanb@apache.org To: commits@activemq.apache.org Message-Id: <06b4e59a99434d3594dd1247b1a8d132@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: activemq git commit: https://issues.apache.org/jira/browse/AMQ-5431 - prevent NPE when a Detach frame is received for a link that didn't get as far as setting a context during creation before being detached/closed Date: Tue, 25 Nov 2014 09:44:35 +0000 (UTC) Repository: activemq Updated Branches: refs/heads/trunk 08b1bedc6 -> 5cd56e7fb https://issues.apache.org/jira/browse/AMQ-5431 - prevent NPE when a Detach frame is received for a link that didn't get as far as setting a context during creation before being detached/closed Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/5cd56e7f Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/5cd56e7f Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/5cd56e7f Branch: refs/heads/trunk Commit: 5cd56e7fb10b5651704009c74b0d180b047add29 Parents: 08b1bed Author: Dejan Bosanac Authored: Tue Nov 25 10:42:55 2014 +0100 Committer: Dejan Bosanac Committed: Tue Nov 25 10:43:27 2014 +0100 ---------------------------------------------------------------------- .../apache/activemq/transport/amqp/AmqpProtocolConverter.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/5cd56e7f/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java ---------------------------------------------------------------------- diff --git a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java index 80f7a40..35cc491 100644 --- a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java +++ b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java @@ -351,7 +351,10 @@ class AmqpProtocolConverter implements IAmqpProtocolConverter { if (remoteState == EndpointState.ACTIVE) { onLinkOpen(link); } else if (remoteState == EndpointState.CLOSED) { - ((AmqpDeliveryListener) link.getContext()).onClose(); + AmqpDeliveryListener context = (AmqpDeliveryListener) link.getContext(); + if (context != null) { + context.onClose(); + } link.close(); link.free(); }