You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2016/10/25 08:32:34 UTC
svn commit: r1766485 -
/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentS3DataStoreStatsTest.java
Author: mreutegg
Date: Tue Oct 25 08:32:34 2016
New Revision: 1766485
URL: http://svn.apache.org/viewvc?rev=1766485&view=rev
Log:
OAK-4995: DocumentS3DataStoreStatsTest.testNoS3BlobStore() does not unregister node store
Modified:
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentS3DataStoreStatsTest.java
Modified: jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentS3DataStoreStatsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentS3DataStoreStatsTest.java?rev=1766485&r1=1766484&r2=1766485&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentS3DataStoreStatsTest.java (original)
+++ jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentS3DataStoreStatsTest.java Tue Oct 25 08:32:34 2016
@@ -102,12 +102,14 @@ public class DocumentS3DataStoreStatsTes
registerDocumentNodeStoreService(true);
assertServiceActivated();
- S3DataStoreStats s3DataStoreStats =
- context.registerInjectActivateService(new S3DataStoreStats(), null);
- assertNull(context.getService(S3DataStoreStatsMBean.class));
-
- unregisterDocumentNodeStoreService();
- unregisterBlobStore();
+ try {
+ S3DataStoreStats s3DataStoreStats =
+ context.registerInjectActivateService(new S3DataStoreStats(), null);
+ assertNull(context.getService(S3DataStoreStatsMBean.class));
+ } finally {
+ unregisterDocumentNodeStoreService();
+ unregisterBlobStore();
+ }
}
private DocumentNodeStoreService documentNodeStoreService;