Fixed production check, removed assertion (#11273)

goedderz · web-flow · commit 0a95b1e2b68f · 2020-03-16T13:32:59.000+01:00
diff --git a/arangod/Graph/Graph.cpp b/arangod/Graph/Graph.cpp
@@ -193,8 +193,7 @@ void Graph::insertOrphanCollections(VPackSlice const arr) {
         "'orphanCollections' are not an array in the graph definition");
   }
   for (auto const& c : VPackArrayIterator(arr)) {
-    TRI_ASSERT(c.isString());
-    validateOrphanCollection(c);
+    THROW_ARANGO_EXCEPTION_IF_FAIL(validateOrphanCollection(c));
     addOrphanCollection(c.copyString());
   }
 }
diff --git a/arangod/Graph/Graph.h b/arangod/Graph/Graph.h
@@ -141,7 +141,7 @@ class Graph {
  public:
   virtual ~Graph() = default;
 
-  static Result validateOrphanCollection(const velocypack::Slice& orphanDefinition);
+  [[nodiscard]] static Result validateOrphanCollection(velocypack::Slice const& orphanDefinition);
 
   virtual void createCollectionOptions(VPackBuilder& builder, bool waitForSync) const;
 
diff --git a/lib/Basics/Exceptions.h b/lib/Basics/Exceptions.h
@@ -59,12 +59,13 @@
   throw arangodb::basics::Exception(code, message, __FILE__, __LINE__)
 
 /// @brief throws an arango result if the result fails
-#define THROW_ARANGO_EXCEPTION_IF_FAIL(result)                         \
-  do {                                                                 \
-    if ((result).fail()) {                                             \
-      throw arangodb::basics::Exception((result), __FILE__, __LINE__); \
-    }                                                                  \
-  } while (0);
+#define THROW_ARANGO_EXCEPTION_IF_FAIL(expression)                                        \
+  do {                                                                                    \
+    auto&& expressionResult = (expression);                                               \
+    if (expressionResult.fail()) {                                                        \
+      throw arangodb::basics::Exception(std::move(expressionResult), __FILE__, __LINE__); \
+    }                                                                                     \
+  } while (0)
 
 namespace arangodb {
 namespace basics {

Original file line number	Diff line number	Diff line change
`@@ -193,8 +193,7 @@ void Graph::insertOrphanCollections(VPackSlice const arr) {`
`193`	`193`	`"'orphanCollections' are not an array in the graph definition");`
`194`	`194`	`}`
`195`	`195`	`for (auto const& c : VPackArrayIterator(arr)) {`
`196`		`- TRI_ASSERT(c.isString());`
`197`		`- validateOrphanCollection(c);`
	`196`	`+ THROW_ARANGO_EXCEPTION_IF_FAIL(validateOrphanCollection(c));`
`198`	`197`	`addOrphanCollection(c.copyString());`
`199`	`198`	`}`
`200`	`199`	`}`