From 140df395da70e7c6a63ea00a4993f152668edee9 Mon Sep 17 00:00:00 2001
From: Pavel Moravec <pmoravec@apache.org>
Date: Mon, 13 Oct 2014 12:24:26 +0000
Subject: QPID-6147: missing journal id in "trace Mgmt create journal." log

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1631360 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/src/qpid/linearstore/JournalImpl.cpp       | 3 +--
 qpid/cpp/src/qpid/linearstore/management-schema.xml | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'qpid/cpp/src')

diff --git a/qpid/cpp/src/qpid/linearstore/JournalImpl.cpp b/qpid/cpp/src/qpid/linearstore/JournalImpl.cpp
index 113533776c..b2d41275a0 100644
--- a/qpid/cpp/src/qpid/linearstore/JournalImpl.cpp
+++ b/qpid/cpp/src/qpid/linearstore/JournalImpl.cpp
@@ -109,9 +109,8 @@ JournalImpl::initManagement(::qpid::management::ManagementAgent* a)
     if (_agent != 0)
     {
         _mgmtObject = ::qmf::org::apache::qpid::linearstore::Journal::shared_ptr (
-            new ::qmf::org::apache::qpid::linearstore::Journal(_agent, this));
+            new ::qmf::org::apache::qpid::linearstore::Journal(_agent, this, _jid));
 
-        _mgmtObject->set_name(_jid);
         _mgmtObject->set_directory(_jdir.dirname());
 //        _mgmtObject->set_baseFileName(_base_filename);
 //        _mgmtObject->set_readPageSize(JRNL_RMGR_PAGE_SIZE * JRNL_SBLK_SIZE);
diff --git a/qpid/cpp/src/qpid/linearstore/management-schema.xml b/qpid/cpp/src/qpid/linearstore/management-schema.xml
index d1cccc2286..a55883a255 100644
--- a/qpid/cpp/src/qpid/linearstore/management-schema.xml
+++ b/qpid/cpp/src/qpid/linearstore/management-schema.xml
@@ -41,7 +41,7 @@
 
   <class name="Journal">
     <property name="queueRef"           type="objId"  access="RO" references="qpid.Queue" isGeneralReference="y"/>
-    <property name="name"               type="sstr"   access="RO" index="y"/>
+    <property name="name"               type="sstr"   access="RC" index="y"/>
     <property name="directory"          type="sstr"   access="RO"              desc="Directory containing journal files"/>
     <property name="baseFileName"       type="sstr"   access="RO"              desc="Deprecated"/>
     <property name="writePageSize"      type="uint32" access="RO" unit="byte"  desc="Deprecated"/>
-- 
cgit v1.2.1