Return more error information in mergeResults.

neunhoef · neunhoef · commit c2fcbc944463 · 2018-10-25T13:34:02.000+02:00
diff --git a/arangod/Cluster/ClusterMethods.cpp b/arangod/Cluster/ClusterMethods.cpp
@@ -210,7 +210,12 @@ 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>();
-      THROW_ARANGO_EXCEPTION(res);
+      VPackSlice msg = arr.get(StaticStrings::ErrorMessage);
+      if (msg.isString()) {
+        THROW_ARANGO_EXCEPTION(res, msg.copyString());
+      } else {
+        THROW_ARANGO_EXCEPTION(res);
+      }
     }
     resultBody->add(arr.at(pair.second));
   }

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,12 @@ 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`		`- THROW_ARANGO_EXCEPTION(res);`
	`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`	`+ }`
`214`	`219`	`}`
`215`	`220`	`resultBody->add(arr.at(pair.second));`
`216`	`221`	`}`