Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 43964 invoked from network); 23 Jun 2010 14:24:47 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 23 Jun 2010 14:24:47 -0000 Received: (qmail 82902 invoked by uid 500); 23 Jun 2010 14:24:47 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 82857 invoked by uid 500); 23 Jun 2010 14:24:46 -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 82846 invoked by uid 99); 23 Jun 2010 14:24:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Jun 2010 14:24:46 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Jun 2010 14:24:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9824223888DD; Wed, 23 Jun 2010 14:23:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r957213 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java Date: Wed, 23 Jun 2010 14:23:51 -0000 To: commits@activemq.apache.org From: dejanb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100623142351.9824223888DD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dejanb Date: Wed Jun 23 14:23:51 2010 New Revision: 957213 URL: http://svn.apache.org/viewvc?rev=957213&view=rev Log: https://issues.apache.org/activemq/browse/AMQ-2790 - check connection to prevent NPEs Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java?rev=957213&r1=957212&r2=957213&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java Wed Jun 23 14:23:51 2010 @@ -45,7 +45,7 @@ public class ActiveMQSessionExecutor imp ActiveMQSessionExecutor(ActiveMQSession session) { this.session = session; - if (this.session.connection.isMessagePrioritySupported()) { + if (this.session.connection != null && this.session.connection.isMessagePrioritySupported()) { this.messageQueue = new SimplePriorityMessageDispatchChannel(); }else { this.messageQueue = new FifoMessageDispatchChannel();