Skip to content

Commit 665ea66

Browse files
author
Hideki Itakura
authored
Merge pull request #1587 from couchbase/fix/1585
Fixed #1585 - ForestDB + Encryption - SIGSEGV during database deletion
2 parents 6c80944 + fe5c6d1 commit 665ea66

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

src/main/java/com/couchbase/lite/router/Router.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1215,12 +1215,11 @@ public Status do_POST_Document_all_docs(Database _db, String _docID, String _att
12151215
List<Object> keys = (List<Object>) body.get("keys");
12161216
options.setKeys(keys);
12171217

1218-
Map<String, Object> result = null;
1219-
result = db.getAllDocs(options);
1220-
convertCBLQueryRowsToMaps(result);
1221-
1218+
Map<String, Object> result = db.getAllDocs(options);
12221219
if (result == null) {
12231220
return new Status(Status.INTERNAL_SERVER_ERROR);
1221+
} else {
1222+
convertCBLQueryRowsToMaps(result);
12241223
}
12251224
connection.setResponseBody(new Body(result));
12261225
return new Status(Status.OK);

0 commit comments

Comments
 (0)