You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ch...@apache.org on 2014/03/18 08:27:00 UTC
svn commit: r1578774 -
/jackrabbit/trunk/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/ds/S3Backend.java
Author: chetanm
Date: Tue Mar 18 07:27:00 2014
New Revision: 1578774
URL: http://svn.apache.org/r1578774
Log:
JCR-3751 - S3Backend fails to initializate from file system based configuration file
Applying patch from Shashank. Thanks!
Modified:
jackrabbit/trunk/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/ds/S3Backend.java
Modified: jackrabbit/trunk/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/ds/S3Backend.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/ds/S3Backend.java?rev=1578774&r1=1578773&r2=1578774&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/ds/S3Backend.java (original)
+++ jackrabbit/trunk/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/ds/S3Backend.java Tue Mar 18 07:27:00 2014
@@ -112,8 +112,10 @@ public class S3Backend implements Backen
//over config provided via file based config
if(this.properties != null){
initProps = this.properties;
- } else if (config == null) {
- config = Utils.DEFAULT_CONFIG_FILE;
+ } else {
+ if(config == null){
+ config = Utils.DEFAULT_CONFIG_FILE;
+ }
try{
initProps = Utils.readConfig(config);
}catch(IOException e){