Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionFactory.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionFactory.java	(revision 620699)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionFactory.java	(working copy)
@@ -56,7 +56,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)) {