From 11046e30a96e06ad30a8a2d696197aa75e0b10b9 Mon Sep 17 00:00:00 2001
From: Michael Hackstein <michael@arangodb.com>
Date: Wed, 17 Feb 2016 09:39:11 +0100
Subject: [PATCH] Explicitly give the Collection Type for HTTP generate saved
 result

---
 arangod/RestHandler/RestDocumentHandler.cpp    |  2 +-
 arangod/RestHandler/RestVocbaseBaseHandler.cpp | 10 ++++++----
 arangod/RestHandler/RestVocbaseBaseHandler.h   |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/arangod/RestHandler/RestDocumentHandler.cpp b/arangod/RestHandler/RestDocumentHandler.cpp
index be774c16c5..3eadc77c8a 100644
--- a/arangod/RestHandler/RestDocumentHandler.cpp
+++ b/arangod/RestHandler/RestDocumentHandler.cpp
@@ -157,7 +157,7 @@ bool RestDocumentHandler::createDocument() {
     return false;
   }
 
-  generateSaved(result, collectionName);
+  generateSaved(result, collectionName, TRI_COL_TYPE_DOCUMENT);
   return true;
 }
 
diff --git a/arangod/RestHandler/RestVocbaseBaseHandler.cpp b/arangod/RestHandler/RestVocbaseBaseHandler.cpp
index 4049c734a8..c0ff9bc648 100644
--- a/arangod/RestHandler/RestVocbaseBaseHandler.cpp
+++ b/arangod/RestHandler/RestVocbaseBaseHandler.cpp
@@ -127,9 +127,14 @@ RestVocbaseBaseHandler::RestVocbaseBaseHandler(HttpRequest* request)
 
 RestVocbaseBaseHandler::~RestVocbaseBaseHandler() {}
 
+////////////////////////////////////////////////////////////////////////////////
+/// @brief Generate a result for successful save
+////////////////////////////////////////////////////////////////////////////////
+
 void RestVocbaseBaseHandler::generateSaved(
     arangodb::OperationResult const& result,
-    std::string const& collectionName) {
+    std::string const& collectionName,
+    TRI_col_type_e type) {
   VPackSlice slice = result.slice();
   TRI_ASSERT(slice.isObject());
 
@@ -141,9 +146,6 @@ void RestVocbaseBaseHandler::generateSaved(
   _response->setContentType("application/json; charset=utf-8");
   _response->setHeader("etag", 4, "\"" + slice.get(TRI_VOC_ATTRIBUTE_REV).copyString() + "\"");
 
-  // TODO This has to be replaced properly
-  TRI_col_type_e type = TRI_COL_TYPE_DOCUMENT;
-
   std::string escapedHandle(DocumentHelper::assembleDocumentId(
       collectionName, slice.get(TRI_VOC_ATTRIBUTE_KEY).copyString(), true));
   if (_request->compatibility() < 10400L) {
diff --git a/arangod/RestHandler/RestVocbaseBaseHandler.h b/arangod/RestHandler/RestVocbaseBaseHandler.h
index 98e19d5e36..520546a6c4 100644
--- a/arangod/RestHandler/RestVocbaseBaseHandler.h
+++ b/arangod/RestHandler/RestVocbaseBaseHandler.h
@@ -189,7 +189,7 @@ class RestVocbaseBaseHandler : public RestBaseHandler {
   //////////////////////////////////////////////////////////////////////////////
 
   void generateSaved(arangodb::OperationResult const& result,
-                     std::string const& collectionName); 
+                     std::string const& collectionName, TRI_col_type_e type);
 
   //////////////////////////////////////////////////////////////////////////////
   /// @brief generates deleted message