From 11ace2de3a3c7ca6b9724ecaeba12f39583609cf Mon Sep 17 00:00:00 2001
From: Max Neunhoeffer <max@arangodb.com>
Date: Fri, 17 Oct 2014 15:33:48 +0200
Subject: [PATCH] Fix registerTransaction in StandaloneTransactionContext.

---
 arangod/Utils/StandaloneTransactionContext.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arangod/Utils/StandaloneTransactionContext.cpp b/arangod/Utils/StandaloneTransactionContext.cpp
index 0c9f593591..f3238339aa 100644
--- a/arangod/Utils/StandaloneTransactionContext.cpp
+++ b/arangod/Utils/StandaloneTransactionContext.cpp
@@ -73,8 +73,9 @@ TRI_transaction_t* StandaloneTransactionContext::getParentTransaction () const {
 ////////////////////////////////////////////////////////////////////////////////
 
 int StandaloneTransactionContext::registerTransaction (TRI_transaction_t* trx) {
-  TRI_ASSERT(_resolver == nullptr);
-  _resolver = new CollectionNameResolver(trx->_vocbase);
+  if (_resolver == nullptr) {
+    _resolver = new CollectionNameResolver(trx->_vocbase);
+  }
 
   return TRI_ERROR_NO_ERROR;
 }