rhmessaging commits: r4531 - in store/trunk/cpp: tests and 1 other directory.
by rhmessaging-commits@lists.jboss.org
Author: kpvdr
Date: 2013-02-08 12:26:16 -0500 (Fri, 08 Feb 2013)
New Revision: 4531
Modified:
store/trunk/cpp/lib/JournalImpl.cpp
store/trunk/cpp/tests/SimpleTest.cpp
Log:
Small tidy-ups, fix for recent compile error in SimpleTest
Modified: store/trunk/cpp/lib/JournalImpl.cpp
===================================================================
--- store/trunk/cpp/lib/JournalImpl.cpp 2013-01-10 18:49:24 UTC (rev 4530)
+++ store/trunk/cpp/lib/JournalImpl.cpp 2013-02-08 17:26:16 UTC (rev 4531)
@@ -149,7 +149,7 @@
jcntl::initialize(num_jfiles, auto_expand, ae_max_jfiles, jfsize_sblks, wcache_num_pages, wcache_pgsize_sblks, cbp);
log(LOG_DEBUG, "Initialization complete");
- if (_mgmtObject != 0)
+ if (_mgmtObject.get() != 0)
{
_mgmtObject->set_initialFileCount(_lpmgr.num_jfiles());
_mgmtObject->set_autoExpand(_lpmgr.is_ae());
@@ -183,7 +183,7 @@
oss1 << " wcache_num_pages=" << wcache_num_pages;
log(LOG_DEBUG, oss1.str());
- if (_mgmtObject != 0)
+ if (_mgmtObject.get() != 0)
{
_mgmtObject->set_initialFileCount(_lpmgr.num_jfiles());
_mgmtObject->set_autoExpand(_lpmgr.is_ae());
@@ -228,7 +228,7 @@
oss2 << "; journal now read-only.";
log(LOG_DEBUG, oss2.str());
- if (_mgmtObject != 0)
+ if (_mgmtObject.get() != 0)
{
_mgmtObject->inc_recordDepth(_emap.size());
_mgmtObject->inc_enqueues(_emap.size());
@@ -349,7 +349,7 @@
{
handleIoResult(jcntl::enqueue_data_record(data_buff, tot_data_len, this_data_len, dtokp, transient));
- if (_mgmtObject != 0)
+ if (_mgmtObject.get() != 0)
{
_mgmtObject->inc_enqueues();
_mgmtObject->inc_recordDepth();
@@ -362,7 +362,7 @@
{
handleIoResult(jcntl::enqueue_extern_data_record(tot_data_len, dtokp, transient));
- if (_mgmtObject != 0)
+ if (_mgmtObject.get() != 0)
{
_mgmtObject->inc_enqueues();
_mgmtObject->inc_recordDepth();
Modified: store/trunk/cpp/tests/SimpleTest.cpp
===================================================================
--- store/trunk/cpp/tests/SimpleTest.cpp 2013-01-10 18:49:24 UTC (rev 4530)
+++ store/trunk/cpp/tests/SimpleTest.cpp 2013-02-08 17:26:16 UTC (rev 4531)
@@ -27,6 +27,7 @@
#include <iostream>
#include "MessageUtils.h"
#include "StoreException.h"
+#include "qpid/broker/DirectExchange.h"
#include <qpid/broker/Queue.h>
#include <qpid/broker/QueueSettings.h>
#include <qpid/broker/RecoveryManagerImpl.h>
11 years, 10 months