Revert "Return more error information in mergeResults."

neunhoef · neunhoef · commit 8e022c255668 · 2018-10-25T13:35:17.000+02:00
This reverts commit c2fcbc9.
diff --git a/arangod/Cluster/ClusterMethods.cpp b/arangod/Cluster/ClusterMethods.cpp
@@ -210,12 +210,7 @@ static void mergeResults(
         arr.get(StaticStrings::Error).isBoolean() && arr.get(StaticStrings::Error).getBoolean()) {
       // an error occurred, now rethrow the error
       int res = arr.get(StaticStrings::ErrorNum).getNumericValue<int>();
-      VPackSlice msg = arr.get(StaticStrings::ErrorMessage);
-      if (msg.isString()) {
-        THROW_ARANGO_EXCEPTION(res, msg.copyString());
-      } else {
-        THROW_ARANGO_EXCEPTION(res);
-      }
+      THROW_ARANGO_EXCEPTION(res);
     }
     resultBody->add(arr.at(pair.second));
   }

Original file line number	Diff line number	Diff line change
`@@ -210,12 +210,7 @@ static void mergeResults(`
`210`	`210`	`arr.get(StaticStrings::Error).isBoolean() && arr.get(StaticStrings::Error).getBoolean()) {`
`211`	`211`	`// an error occurred, now rethrow the error`
`212`	`212`	`int res = arr.get(StaticStrings::ErrorNum).getNumericValue<int>();`
`213`		`- VPackSlice msg = arr.get(StaticStrings::ErrorMessage);`
`214`		`- if (msg.isString()) {`
`215`		`- THROW_ARANGO_EXCEPTION(res, msg.copyString());`
`216`		`- } else {`
`217`		`- THROW_ARANGO_EXCEPTION(res);`
`218`		`- }`
	`213`	`+ THROW_ARANGO_EXCEPTION(res);`
`219`	`214`	`}`
`220`	`215`	`resultBody->add(arr.at(pair.second));`
`221`	`216`	`}`