You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2012/01/19 14:30:40 UTC
svn commit: r1233365 - in /jackrabbit/branches/2.4: ./
jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCARepositoryManager.java
Author: jukka
Date: Thu Jan 19 13:30:39 2012
New Revision: 1233365
URL: http://svn.apache.org/viewvc?rev=1233365&view=rev
Log:
2.4: Merged revision 1232831 (JCR-3189)
Modified:
jackrabbit/branches/2.4/ (props changed)
jackrabbit/branches/2.4/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCARepositoryManager.java
Propchange: jackrabbit/branches/2.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 19 13:30:39 2012
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1221447,1221579,1221593,1221789,1221818,1225179,1225191,1225196,1225207,1225525,1225528,1226452,1226472,1226515,1226750,1226863,1227171,1227240,1227590,1227593,1227615,1228058,1228149,1228155,1228160,1230507,1230681,1230688,1231204,1232035,1232100,1232404,1232920,1233344
+/jackrabbit/trunk:1221447,1221579,1221593,1221789,1221818,1225179,1225191,1225196,1225207,1225525,1225528,1226452,1226472,1226515,1226750,1226863,1227171,1227240,1227590,1227593,1227615,1228058,1228149,1228155,1228160,1230507,1230681,1230688,1231204,1232035,1232100,1232404,1232831,1232920,1233344
Modified: jackrabbit/branches/2.4/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCARepositoryManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCARepositoryManager.java?rev=1233365&r1=1233364&r2=1233365&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCARepositoryManager.java (original)
+++ jackrabbit/branches/2.4/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCARepositoryManager.java Thu Jan 19 13:30:39 2012
@@ -24,6 +24,7 @@ import org.apache.jackrabbit.commons.Jcr
import org.apache.jackrabbit.core.RepositoryImpl;
import org.apache.jackrabbit.core.config.RepositoryConfig;
+import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
@@ -115,8 +116,10 @@ public final class JCARepositoryManager
}
}
}
- } else {
+ } else if (configFile != null) {
config = RepositoryConfig.create(configFile, homeDir);
+ } else {
+ config = RepositoryConfig.create(new File(homeDir));
}
return RepositoryImpl.create(config);
}