svn commit: r807462 - /felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java

[ffang]

Author: ffang
Date: Tue Aug 25 03:17:46 2009
New Revision: 807462

URL: http://svn.apache.org/viewvc?rev=807462&view=rev
Log:
[FELIX-1519]Karaf Failover does not work with PostgreSQL and Oracle

Modified:
    
felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java

Modified: 
felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java?rev=807462&r1=807461&r2=807462&view=diff
==============================================================================
--- 
felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java
 (original)
+++ 
felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java
 Tue Aug 25 03:17:46 2009
@@ -147,6 +147,7 @@
         if (lockConnection != null && !lockConnection.isClosed()) {
             lockConnection.rollback();
             lockConnection.close();
+            lockConnection = null;
         }
     }
 
@@ -197,7 +198,11 @@
         Connection conn = null;
         try {
             Class.forName(driver);
-            conn = DriverManager.getConnection(url + ";create=true", username, 
password);
+            if (url.startsWith("jdbc:derby:")) {
+                conn = DriverManager.getConnection(url + ";create=true", 
username, password);
+            } else {
+                conn = DriverManager.getConnection(url, username, password);
+            }
         } catch (Exception e) {
             System.err.println("Error occured while setting up JDBC 
connection: " + e);
             throw e;