-
Notifications
You must be signed in to change notification settings - Fork 855
fix it! #10198
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our term 10000 s of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix it! #10198
Conversation
@@ -487,7 +488,7 @@ void RestVocbaseBaseHandler::generateTransactionError(std::string const& collect | |||
return; | |||
|
|||
case TRI_ERROR_ARANGO_CONFLICT: | |||
if (result.buffer != nullptr) { | |||
if (result.buffer != nullptr && !result.slice().isNone()) { | |||
// This case happens if we come via the generateTransactionError that |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this consistent with the behavior in the other crud methods now ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't know. But if the slice is None
, we will not be able to serialize it to JSON later on.
…ture/one-shard-clean-up-2 * 'devel' of https://github.com/arangodb/arangodb: Bug fix/improve stringutils performance (#10208) add option to talk to the SUT using VST (#10217) Doc - Added "log-output" example (#10207) fix it! (#10198) add missing include Bug fix/fix simple example dep proxy skip some regression test (#10213) fixed ui behaviour when replacing a foxx app (#9719) [devel] Fix document search (Ctrl+F/Cmd+F) (#10216) Convert many uses of ClusterComm to Fuerte (#10154) Remove invokeOnAllElements (#10212) AQL Subquery: MultiDependencyRowFetcher (#10101) Bug fix/fix remote executor races (#10206) fix several inefficiencies in Store (#10189) Deprecate rocksdb.max-write-buffer-number startup option (#9654) fix arangosh with vst
…ture/cpp17 * 'devel' of https://github.com/arangodb/arangodb: (46 commits) use automatic parsing so we can seamlessly switch HTTP / VST. (#10241) fix handling of VST urls in test (#10240) if we answer a head request, we mustn't create a body for errors (#10227) Move containers into their own folder and namespace. (#10244) when changing between leader and follower re-attempt connecting to circumvent OS resource shortages (#10243) Fix content-type for JS APIs (#10225) Feature/one shard clean up 2 (#10238) Fix dbserver locking and releasing for hotbackup. (#10177) Improve timings for hotbackup locking. (#10229) unintentionally broke something. fixed... throw parse error if we fail to parse the json document (#10226) Bug fix/improve stringutils performance (#10208) add option to talk to the SUT using VST (#10217) Doc - Added "log-output" example (#10207) fix it! (#10198) add missing include Bug fix/fix simple example dep proxy skip some regression test (#10213) fixed ui behaviour when replacing a foxx app (#9719) [devel] Fix document search (Ctrl+F/Cmd+F) (#10216) Convert many uses of ClusterComm to Fuerte (#10154) ...
…7-remove-mac-hack * origin/feature/cpp17: use automatic parsing so we can seamlessly switch HTTP / VST. (#10241) fix handling of VST urls in test (#10240) if we answer a head request, we mustn't create a body for errors (#10227) Move containers into their own folder and namespace. (#10244) when changing between leader and follower re-attempt connecting to circumvent OS resource shortages (#10243) Fix content-type for JS APIs (#10225) Feature/one shard clean up 2 (#10238) Fix dbserver locking and releasing for hotbackup. (#10177) Improve timings for hotbackup locking. (#10229) unintentionally broke something. fixed... throw parse error if we fail to parse the json document (#10226) Bug fix/improve stringutils performance (#10208) add option to talk to the SUT using VST (#10217) Doc - Added "log-output" example (#10207) fix it! (#10198) add missing include
Scope & Purpose
This bug is about:
Testing & Verification
This change is a trivial rework / code cleanup without any test coverage.
https://172.16.10.101/view/PR/job/arangodb-matrix-pr/6647/