svn commit: r1769757 - /jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreUtils.java

[amitj]

Author: amitj
Date: Tue Nov 15 08:42:15 2016
New Revision: 1769757

URL: http://svn.apache.org/viewvc?rev=1769757&view=rev
Log:
OAK-5109: [Test] Ignore if config properties file not available

Ignoring and returning empty properties

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=1769757&r1=1769756&r2=1769757&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
 Tue Nov 15 08:42:15 2016
@@ -18,6 +18,7 @@
  */
 package org.apache.jackrabbit.oak.blob.cloud.s3;
 
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -97,24 +98,24 @@ public class S3DataStoreUtils extends Da
             config = DEFAULT_CONFIG_PATH;
         }
         Properties props = new Properties();
-        InputStream is = null;
-        try {
-            props.load(new FileInputStream(config));
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            IOUtils.closeQuietly(is);
-        }
-        props.putAll(getConfig());
-        Map filtered = Maps.filterEntries(Maps.fromProperties(props),
-            new Predicate<Map.Entry<? extends Object, ? extends Object>>() {
-                @Override
-                public boolean apply(Map.Entry<? extends Object, ? extends 
Object> input) {
+        if (new File(config).exists()) {
+            InputStream is = null;
+            try {
+                props.load(new FileInputStream(config));
+            } catch (Exception e) {
+                e.printStackTrace();
+            } finally {
+                IOUtils.closeQuietly(is);
+            }
+            props.putAll(getConfig());
+            Map filtered = Maps.filterEntries(Maps.fromProperties(props), new 
Predicate<Map.Entry<? extends Object, ? extends Object>>() {
+                @Override public boolean apply(Map.Entry<? extends Object, ? 
extends Object> input) {
                     return !Strings.isNullOrEmpty((String) input.getValue());
                 }
             });
-        props = new Properties();
-        props.putAll(filtered);
+            props = new Properties();
+            props.putAll(filtered);
+        }
         return props;
     }