Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed "collection is a nullptr" issue when starting a traversal from a transaction

This commit is contained in:
jsteemann 2016-06-25 15:54:14 +02:00
parent bedab04286
commit 96e2473ae2
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@ -13,6 +13,8 @@ devel
v3.0.1 (XXXX-XX-XX) v3.0.1 (XXXX-XX-XX)
------------------- -------------------
* fixed "collection is a nullptr" issue when starting a traversal from a transaction
* enable /_api/import on coordinator servers * enable /_api/import on coordinator servers
@ -343,6 +345,8 @@ v3.0.0-rc1 (2015-06-10)
v2.8.10 (XXXX-XX-XX) v2.8.10 (XXXX-XX-XX)
-------------------- --------------------
* fixed "collection is a nullptr" issue when starting a traversal from a transaction
* honor the value of startup option `--database.wait-for-sync` (that is used to control * honor the value of startup option `--database.wait-for-sync` (that is used to control
whether new collections are created with `waitForSync` set to `true` by default) also whether new collections are created with `waitForSync` set to `true` by default) also
when creating collections via the HTTP API (and thus the ArangoShell). When creating when creating collections via the HTTP API (and thus the ArangoShell). When creating

8
arangod/Utils/Transaction.h
View File

@ -235,7 +235,7 @@ class Transaction {
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
bool isSingleOperationTransaction() const { bool isSingleOperationTransaction() const {
return TRI_IsSingleOperationTransaction(this->getInternals()); return TRI_IsSingleOperationTransaction(_trx);
} }
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
@ -389,13 +389,13 @@ class Transaction {
auto collection = this->trxCollection(cid); auto collection = this->trxCollection(cid);
if (collection == nullptr) { if (collection == nullptr) {
int res = TRI_AddCollectionTransaction(this->getInternals(), cid, int res = TRI_AddCollectionTransaction(_trx, cid,
type, type,
this->nestingLevel(), true, true); _nestingLevel, true, true);
if (res != TRI_ERROR_NO_ERROR) { if (res != TRI_ERROR_NO_ERROR) {
THROW_ARANGO_EXCEPTION(res); THROW_ARANGO_EXCEPTION(res);
} }
TRI_EnsureCollectionsTransaction(this->getInternals()); TRI_EnsureCollectionsTransaction(_trx, _nestingLevel);
collection = this->trxCollection(cid); collection = this->trxCollection(cid);
if (collection == nullptr) { if (collection == nullptr) {