jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cko...@apache.org
Subject svn commit: r1232831 - /jackrabbit/trunk/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCARepositoryManager.java
Date Wed, 18 Jan 2012 11:01:45 GMT
Author: ckoell
Date: Wed Jan 18 11:01:45 2012
New Revision: 1232831

URL: http://svn.apache.org/viewvc?rev=1232831&view=rev
Log:
JCR-3189 JCARepositoryManager.createNonTransientRepository throws NPE with no JCAManagedConnectionFactory.CONFIGFILE_KEY

Modified:
    jackrabbit/trunk/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCARepositoryManager.java

Modified: jackrabbit/trunk/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCARepositoryManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCARepositoryManager.java?rev=1232831&r1=1232830&r2=1232831&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCARepositoryManager.java
(original)
+++ jackrabbit/trunk/jackrabbit-jca/src/main/java/org/apache/jackrabbit/jca/JCARepositoryManager.java
Wed Jan 18 11:01:45 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);
 	}



Mime
View raw message