[rhmessaging-commits] rhmessaging commits: r3688 - store/trunk/cpp/lib.
Author: kpvdr
Date: 2009-11-02 11:35:46 -0500 (Mon, 02 Nov 2009)
New Revision: 3688
Modified:
store/trunk/cpp/lib/MessageStoreImpl.cpp
Log:
Fixed compile error introduced in r.3687 which fails on RHEL4/5 compilers, but which works
on Fedora.
Modified: store/trunk/cpp/lib/MessageStoreImpl.cpp
===================================================================
--- store/trunk/cpp/lib/MessageStoreImpl.cpp 2009-11-02 15:39:32 UTC (rev 3687)
+++ store/trunk/cpp/lib/MessageStoreImpl.cpp 2009-11-02 16:35:46 UTC (rev 3688)
@@ -1464,13 +1464,13 @@
std::vector<char> buff;
if (!message->isContentReleased() )
{
- try { buff = std::vector<char>(size); } // long + headers + content
- catch (const std::exception& e) {
+ try { buff = std::vector<char>(size); } // long + headers + content
+ catch (const std::exception& e) {
std::ostringstream oss;
oss << "Unable to allocate memory for encoding message; requested
size: " << size << "; error: " << e.what();
THROW_STORE_EXCEPTION(oss.str());
}
- Buffer buffer(buff.data(),size);
+ Buffer buffer(&buff[0],size);
buffer.putLong(headerSize);
message->encode(buffer);
}
@@ -1488,19 +1488,19 @@
if (message->isContentReleased()) {
jc->enqueue_extern_data_record(size, dtokp.get(),
!message->isPersistent());
} else {
- jc->enqueue_data_record(buff.data(), size, size, dtokp.get(),
!message->isPersistent());
+ jc->enqueue_data_record(&buff[0], size, size, dtokp.get(),
!message->isPersistent());
}
} else {
if (message->isContentReleased()) {
jc->enqueue_extern_txn_data_record(size, dtokp.get(),
txn->getXid(), !message->isPersistent());
} else {
- jc->enqueue_txn_data_record(buff.data(), size, size, dtokp.get(),
txn->getXid(), !message->isPersistent());
+ jc->enqueue_txn_data_record(&buff[0], size, size, dtokp.get(),
txn->getXid(), !message->isPersistent());
}
}
} else {
/// cct message db
if (newId) { // only store in Bd if first time message is stored
- Dbt data(buff.data(),size);
+ Dbt data(&buff[0],size);
messageDb->put(txn->get(), &messageId, &data,
DB_NOOVERWRITE);
}
}