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 st...@apache.org on 2015/08/24 15:57:48 UTC
svn commit: r1697399 -
/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentDiscoveryLiteServiceTest.java
Author: stefanegli
Date: Mon Aug 24 13:57:48 2015
New Revision: 1697399
URL: http://svn.apache.org/r1697399
Log:
OAK-2844 - avoid a NPE on clear on jenkins
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentDiscoveryLiteServiceTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentDiscoveryLiteServiceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentDiscoveryLiteServiceTest.java?rev=1697399&r1=1697398&r2=1697399&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentDiscoveryLiteServiceTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentDiscoveryLiteServiceTest.java Mon Aug 24 13:57:48 2015
@@ -55,6 +55,7 @@ import org.apache.jackrabbit.oak.api.Des
import org.apache.jackrabbit.oak.commons.json.JsonObject;
import org.apache.jackrabbit.oak.commons.json.JsopTokenizer;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
+import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.apache.jackrabbit.oak.spi.blob.MemoryBlobStore;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
@@ -1009,8 +1010,13 @@ public class DocumentDiscoveryLiteServic
}
mks.clear();
if (MONGO_DB) {
- DB db = MongoUtils.getConnection().getDB();
- MongoUtils.dropCollections(db);
+ MongoConnection connection = MongoUtils.getConnection();
+ if (connection != null) {
+ DB db = connection.getDB();
+ if (db != null) {
+ MongoUtils.dropCollections(db);
+ }
+ }
}
}