Fix ArangoDatabase.transaction(): ignore null result

CarthageKing · Aug 14, 2017 · b25f87a · b25f87a
1 parent c3229d7
commit b25f87a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+v4.2.x (xxxx-xx-xx)
+---------------------------
+* fixed ArangoDatabase.transaction(): ignore null result
+
 v4.2.3 (2017-07-31)
 ---------------------------
 * added ArangoDatabase.getPermissions(String)

diff --git a/src/main/java/com/arangodb/internal/InternalArangoDatabase.java b/src/main/java/com/arangodb/internal/InternalArangoDatabase.java
@@ -304,7 +304,7 @@ public T deserialize(final Response response) throws VPackException {
 				final VPackSlice body = response.getBody();
 				if (body != null) {
 					final VPackSlice result = body.get(ArangoDBConstants.RESULT);
-					if (!result.isNone()) {
+					if (!result.isNone() && !result.isNull()) {
 						return util().deserialize(result, type);
 					}
 				}