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 2008/02/16 13:04:33 UTC
svn commit: r628275 -
/jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionFactory.java
Author: jukka
Date: Sat Feb 16 04:04:31 2008
New Revision: 628275
URL: http://svn.apache.org/viewvc?rev=628275&view=rev
Log:
1.4: Merged revision 627496 (JCR-1372)
Modified:
jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionFactory.java
Modified: jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionFactory.java?rev=628275&r1=628274&r2=628275&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionFactory.java (original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionFactory.java Sat Feb 16 04:04:31 2008
@@ -50,7 +50,7 @@
public static Connection getConnection(String driver, String url,
String user, String password) throws RepositoryException,
SQLException {
- if (driver != null || driver.length() > 0) {
+ if (driver != null && driver.length() > 0) {
try {
Class d = Class.forName(driver);
if (javax.naming.Context.class.isAssignableFrom(d)) {