Skip to content

OAK-12113: MongoDocumentStore: BsonException should be wrapped as DocumentStoreException #2771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
reschke wants to merge 1 commit into
base: trunk
Choose a base branch
from
+6 −3
Open

OAK-12113: MongoDocumentStore: BsonException should be wrapped as DocumentStoreException #2771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...nt/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1675,7 +1675,7 @@ private <T extends Document> BulkRequestResult sendBulkRequest(final Collection<
updateOps.size(), bsonException.getMessage(), idOfbiggestUpdate, estimatedSizeOfBiggestUpdate,
bsonException);
// rethrow
throw bsonException;
throw new DocumentStoreException(bsonException);
}

for (BulkWriteUpsert upsert : bulkResult.getUpserts()) {
Expand Down
7 changes: 5 additions & 2 deletions .../src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDBExceptionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,11 @@ public void createOrUpdate16MBBatchWithMultiDocs() {
try {
store.createOrUpdate(Collection.NODES, updateOps);
fail("createOrUpdate(many with one >16MB) should have failed");
} catch (BSONException expected) {
// currently expected but incorrect -> OAK-12113
} catch (DocumentStoreException expected) {
assertTrue("DocumentStoreException should wrap BSONException, but got: "+
expected.getCause(),
expected.getCause() instanceof BSONException);

List<String> messages = log.getLogs();
assertEquals("only 1 message expected, but got: " + messages.size(),
1, messages.size());
Expand Down
Loading