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:51:56 UTC
svn commit: r1795503 - in /jackrabbit/oak/branches/1.6: ./
oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreUtils.java
Author: amitj
Date: Thu May 18 10:51:56 2017
New Revision: 1795503
URL: http://svn.apache.org/viewvc?rev=1795503&view=rev
Log:
OAK-6230: Minor cleanup for S3 tests
Merged r1795502 from trunk
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreUtils.java
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 18 10:51:56 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,1795488,1795491
+/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,1795502
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.6/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreUtils.java?rev=1795503&r1=1795502&r2=1795503&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreUtils.java (original)
+++ jackrabbit/oak/branches/1.6/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreUtils.java Thu May 18 10:51:56 2017
@@ -93,7 +93,7 @@ public class S3DataStoreUtils extends Da
* @return Properties instance
*/
public static Properties getS3Config() {
- String config = System.getProperty("config");
+ String config = System.getProperty("s3.config");
if (Strings.isNullOrEmpty(config)) {
config = DEFAULT_CONFIG_PATH;
}
@@ -101,7 +101,8 @@ public class S3DataStoreUtils extends Da
if (new File(config).exists()) {
InputStream is = null;
try {
- props.load(new FileInputStream(config));
+ is = new FileInputStream(config);
+ props.load(is);
} catch (Exception e) {
e.printStackTrace();
} finally {