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 AFFCEE979 for ; Wed, 6 Feb 2013 00:08:19 +0000 (UTC) Received: (qmail 14128 invoked by uid 500); 6 Feb 2013 00:08:19 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 14098 invoked by uid 500); 6 Feb 2013 00:08:19 -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 14089 invoked by uid 99); 6 Feb 2013 00:08:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Feb 2013 00:08:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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, 06 Feb 2013 00:08:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B0FE023888D2; Wed, 6 Feb 2013 00:07:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1442806 - /activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/inactivity/InactivityMonitor.cpp Date: Wed, 06 Feb 2013 00:07:59 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130206000759.B0FE023888D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tabish Date: Wed Feb 6 00:07:59 2013 New Revision: 1442806 URL: http://svn.apache.org/viewvc?rev=1442806&view=rev Log: https://issues.apache.org/jira/browse/AMQCPP-454 Check to see if the internal data has been created yet. Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/inactivity/InactivityMonitor.cpp Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/inactivity/InactivityMonitor.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/inactivity/InactivityMonitor.cpp?rev=1442806&r1=1442805&r2=1442806&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/inactivity/InactivityMonitor.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/inactivity/InactivityMonitor.cpp Wed Feb 6 00:07:59 2013 @@ -467,6 +467,10 @@ void InactivityMonitor::startMonitorThre //////////////////////////////////////////////////////////////////////////////// void InactivityMonitor::stopMonitorThreads() { + if (this->members == NULL) { + return; + } + synchronized(&this->members->monitor) { if (this->members->monitorStarted.compareAndSet(true, false)) {