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 re...@apache.org on 2020/02/24 14:41:32 UTC
svn commit: r1874452 - /jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java

Author: reschke
Date: Mon Feb 24 14:41:31 2020
New Revision: 1874452

URL: http://svn.apache.org/viewvc?rev=1874452&view=rev
Log:
OAK-8922: oak-run-commons: OakFixture broken for BlobStores that do not implement BlobAccessProvider

Modified:
    jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java

Modified: jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java?rev=1874452&r1=1874451&r2=1874452&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java (original)
+++ jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java Mon Feb 24 14:41:31 2020
@@ -225,7 +225,7 @@ public abstract class OakFixture {
                     builder.setBlobStore(blobStore);
                 }
                 Oak oak = newOak(builder.build());
-                if (blobStore != null) {
+                if (blobStore instanceof BlobAccessProvider) {
                     oak.getWhiteboard()
                         .register(BlobAccessProvider.class, (BlobAccessProvider) blobStore, Collections.EMPTY_MAP);
                 }
@@ -250,7 +250,7 @@ public abstract class OakFixture {
                     }
                     nodeStores[i] = builder.build();
                     cluster[i] = newOak(nodeStores[i]);
-                    if (blobStore != null) {
+                    if (blobStore instanceof BlobAccessProvider) {
                         cluster[i].getWhiteboard()
                             .register(BlobAccessProvider.class, (BlobAccessProvider) blobStore, Collections.EMPTY_MAP);
                     }
@@ -448,7 +448,7 @@ public abstract class OakFixture {
         @Override
         public Oak getOak(int clusterId) throws Exception {
             Oak oak = newOak(getBuilder(clusterId).build());
-            if (this.blobStore != null) {
+            if (this.blobStore instanceof BlobAccessProvider) {
                 oak.getWhiteboard()
                     .register(BlobAccessProvider.class, (BlobAccessProvider) this.blobStore, Collections.EMPTY_MAP);
             }
@@ -459,7 +459,7 @@ public abstract class OakFixture {
             Oak[] cluster = new Oak[builders.length];
             for (int i = 0; i < cluster.length; i++) {
                 cluster[i] = newOak(builders[i].build());
-                if (this.blobStore != null) {
+                if (this.blobStore instanceof BlobAccessProvider) {
                     cluster[i].getWhiteboard()
                         .register(BlobAccessProvider.class, (BlobAccessProvider) this.blobStore, Collections.EMPTY_MAP);
                 }