svn commit: r1857317 - in /jackrabbit/oak/branches/1.10: ./ oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/ oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/

[reschke]

Author: reschke
Date: Thu Apr 11 12:42:54 2019
New Revision: 1857317

URL: http://svn.apache.org/viewvc?rev=1857317&view=rev
Log:
OAK-8214: RDBDocumentStore may not inherit ReadOnly flag from DocumentNodeStore 
(ported to 1.10)

Added:
    
jackrabbit/oak/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilderTest.java
      - copied unchanged from r1857314, 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilderTest.java
Modified:
    jackrabbit/oak/branches/1.10/   (props changed)
    
jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java

Propchange: jackrabbit/oak/branches/1.10/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 11 12:42:54 2019
@@ -1,3 +1,3 @@
 /jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854533,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1854990-1854991,1855032,1855221,1855477-1855478,1855776,1857010,1857104,1857159,1857212,1857221,1857238,1857247,1857253,1857294
+/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854533,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1854990-1854991,1855032,1855221,1855477-1855478,1855776,1857010,1857104,1857159,1857212,1857221,1857238,1857247,1857253,1857294,1857314
 /jackrabbit/trunk:1345480

Modified: 
jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java?rev=1857317&r1=1857316&r2=1857317&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java
 (original)
+++ 
jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java
 Thu Apr 11 12:42:54 2019
@@ -16,6 +16,8 @@
  */
 package org.apache.jackrabbit.oak.plugins.document.rdb;
 
+import static com.google.common.base.Suppliers.memoize;
+
 import javax.sql.DataSource;
 
 import org.apache.jackrabbit.oak.plugins.blob.ReferencedBlob;
@@ -25,8 +27,6 @@ import org.apache.jackrabbit.oak.plugins
 import org.apache.jackrabbit.oak.plugins.document.VersionGCSupport;
 import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore;
 
-import static com.google.common.base.Suppliers.ofInstance;
-
 /**
  * A builder for a {@link DocumentNodeStore} backed by a relational database.
  */
@@ -58,8 +58,8 @@ public class RDBDocumentNodeStoreBuilder
      * @return this
      */
     public RDBDocumentNodeStoreBuilder setRDBConnection(DataSource ds, 
RDBOptions options) {
-        this.documentStoreSupplier = ofInstance(new RDBDocumentStore(ds, this, 
options));
-        if(blobStore == null) {
+        this.documentStoreSupplier = memoize(() -> new RDBDocumentStore(ds, 
this, options));
+        if (blobStore == null) {
             GarbageCollectableBlobStore s = new RDBBlobStore(ds, options);
             setGCBlobStore(s);
         }
@@ -73,8 +73,8 @@ public class RDBDocumentNodeStoreBuilder
      * @return this
      */
     public RDBDocumentNodeStoreBuilder setRDBConnection(DataSource 
documentStoreDataSource, DataSource blobStoreDataSource) {
-        this.documentStoreSupplier = ofInstance(new 
RDBDocumentStore(documentStoreDataSource, this));
-        if(blobStore == null) {
+        this.documentStoreSupplier = memoize(() -> new 
RDBDocumentStore(documentStoreDataSource, this));
+        if (blobStore == null) {
             GarbageCollectableBlobStore s = new 
RDBBlobStore(blobStoreDataSource);
             setGCBlobStore(s);
         }