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 am...@apache.org on 2017/05/18 10:17:41 UTC
svn commit: r1795501 - in /jackrabbit/oak/branches/1.6: ./
oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java
oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCheckTest.java
Author: amitj
Date: Thu May 18 10:17:41 2017
New Revision: 1795501
URL: http://svn.apache.org/viewvc?rev=1795501&view=rev
Log:
OAK-6233: Typed properties not handled properly in the initialization of DataStore in oak-run
- Merged r1795488 from trunk
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java
jackrabbit/oak/branches/1.6/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCheckTest.java
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 18 10:17:41 2017
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785919,1785946,1787074,1787217,1787425,1788378,1788387-1788389,1788850,1789056,1790382,1792463,1792742,1792746,1793088,1793618,1793627,1793644,1795314,1795330,1795475
+/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785919,1785946,1787074,1787217,1787425,1788378,1788387-1788389,1788850,1789056,1790382,1792463,1792742,1792746,1793088,1793618,1793627,1793644,1795314,1795330,1795475,1795488,1795491
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.6/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java?rev=1795501&r1=1795500&r2=1795501&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java (original)
+++ jackrabbit/oak/branches/1.6/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java Thu May 18 10:17:41 2017
@@ -27,6 +27,7 @@ import java.io.IOException;
import java.util.Dictionary;
import java.util.Enumeration;
import java.util.List;
+import java.util.Map;
import java.util.Properties;
import javax.annotation.Nullable;
@@ -168,7 +169,7 @@ class Utils {
delegate = new OakFileDataStore();
String cfgPath = fdsConfig.value(options);
Properties props = loadAndTransformProps(cfgPath);
- populate(delegate, Maps.fromProperties(props), true);
+ populate(delegate, asMap(props), true);
delegate.init(null);
}
DataStoreBlobStore blobStore = new DataStoreBlobStore(delegate);
@@ -242,4 +243,12 @@ class Utils {
}
return props;
}
+
+ private static Map<String, ?> asMap(Properties props) {
+ Map<String, Object> map = Maps.newHashMap();
+ for (Object key : props.keySet()) {
+ map.put((String)key, props.get(key));
+ }
+ return map;
+ }
}
Modified: jackrabbit/oak/branches/1.6/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCheckTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCheckTest.java?rev=1795501&r1=1795500&r2=1795501&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCheckTest.java (original)
+++ jackrabbit/oak/branches/1.6/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCheckTest.java Thu May 18 10:17:41 2017
@@ -126,6 +126,7 @@ public class DataStoreCheckTest {
File cfgFile = temporaryFolder.newFile();
Properties props = new Properties();
props.put("path", dsPath);
+ props.put("minRecordLength", new Long(4096));
cfgFilePath = createTempConfig(cfgFile, props);
dsOption = "fds";
}