You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by st...@apache.org on 2008/02/13 16:56:30 UTC

svn commit: r627496 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionFactory.java

Author: stefan
Date: Wed Feb 13 07:56:22 2008
New Revision: 627496

URL: http://svn.apache.org/viewvc?rev=627496&view=rev
Log:
JCR-1372:  [PATCH] Fix possible Null Ptr exception

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionFactory.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionFactory.java?rev=627496&r1=627495&r2=627496&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionFactory.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionFactory.java Wed Feb 13 07:56:22 2008
@@ -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)) {