Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 48403 invoked from network); 20 Jul 2007 17:04:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Jul 2007 17:04:01 -0000 Received: (qmail 74979 invoked by uid 500); 20 Jul 2007 17:04:03 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 74959 invoked by uid 500); 20 Jul 2007 17:04:03 -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 74946 invoked by uid 99); 20 Jul 2007 17:04:03 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Jul 2007 10:04:03 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Jul 2007 10:04:01 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 11D211A981D; Fri, 20 Jul 2007 10:03:41 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r558052 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java Date: Fri, 20 Jul 2007 17:03:40 -0000 To: commits@activemq.apache.org From: rajdavies@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070720170341.11D211A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rajdavies Date: Fri Jul 20 10:03:39 2007 New Revision: 558052 URL: http://svn.apache.org/viewvc?view=rev&rev=558052 Log: fix null pointer in test case Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java?view=diff&rev=558052&r1=558051&r2=558052 ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java Fri Jul 20 10:03:39 2007 @@ -1603,13 +1603,15 @@ } @Override - public Response processProducerAck(ProducerAck pa) throws Exception { - ActiveMQMessageProducer producer = producers.get(pa.getProducerId()); - if( producer!=null ) { - producer.onProducerAck(pa); - } - return null; - } + public Response processProducerAck(ProducerAck pa) throws Exception{ + if(pa!=null&&pa.getProducerId()!=null){ + ActiveMQMessageProducer producer=producers.get(pa.getProducerId()); + if(producer!=null){ + producer.onProducerAck(pa); + } + } + return null; + } @Override public Response processBrokerInfo(BrokerInfo info) throws Exception {