You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openjpa.apache.org by fa...@apache.org on 2009/03/19 16:32:38 UTC

svn commit: r756045 - /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java

Author: faywang
Date: Thu Mar 19 15:32:33 2009
New Revision: 756045

URL: http://svn.apache.org/viewvc?rev=756045&view=rev
Log:
OPENJPA-973: allow db2 jcc driver to access Informix

Modified:
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java?rev=756045&r1=756044&r2=756045&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java Thu Mar 19 15:32:33 2009
@@ -73,9 +73,9 @@
      */
     public static DBDictionary calculateDBDictionary(JDBCConfiguration conf,
         String url, String driver, String props) {
-        String dclass = dictionaryClassForString(driver, conf);
+        String dclass = dictionaryClassForString(getProtocol(url), conf);
         if (dclass == null)
-            dclass = dictionaryClassForString(getProtocol(url), conf);
+            dclass = dictionaryClassForString(driver, conf);
         if (dclass == null)
             return null;
         return newDBDictionary(conf, dclass, props);