Author: amitj
Date: Thu May 18 10:47:12 2017
New Revision: 1795502
URL: http://svn.apache.org/viewvc?rev=1795502&view=rev
Log:
OAK-6230: Minor cleanup for S3 tests
- Changed config param to s3.config to align with azure config
- Fixed closing of the input stream
Modified:
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreUtils.java
Modified:
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreUtils.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreUtils.java?rev=1795502&r1=1795501&r2=1795502&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreUtils.java
(original)
+++
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreUtils.java
Thu May 18 10:47:12 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 {
