openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From allee8...@apache.org
Subject svn commit: r710181 - /openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java
Date Mon, 03 Nov 2008 21:52:52 GMT
Author: allee8285
Date: Mon Nov  3 13:52:52 2008
New Revision: 710181

URL: http://svn.apache.org/viewvc?rev=710181&view=rev
Log:
OPENJPA-760 - Commit contributions on behalf of Georgi Naplatanov.

Modified:
    openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java

Modified: openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java?rev=710181&r1=710180&r2=710181&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java
(original)
+++ openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java
Mon Nov  3 13:52:52 2008
@@ -73,9 +73,9 @@
      */
     public static DBDictionary calculateDBDictionary(JDBCConfiguration conf,
         String url, String driver, String props) {
-        String dclass = dictionaryClassForString(url, conf);
+        String dclass = dictionaryClassForString(driver, conf);
         if (dclass == null)
-            dclass = dictionaryClassForString(driver, conf);
+            dclass = dictionaryClassForString(url, conf);
         if (dclass == null)
             return null;
         return newDBDictionary(conf, dclass, props);
@@ -90,10 +90,10 @@
         try {
             conn = ds.getConnection();
             DatabaseMetaData meta = conn.getMetaData();
-            String dclass = dictionaryClassForString(meta.getURL(), conf);
+            String dclass = dictionaryClassForString(meta
+                .getDatabaseProductName(), conf);
             if (dclass == null)
-                dclass = dictionaryClassForString
-                    (meta.getDatabaseProductName(), conf);
+                dclass = dictionaryClassForString(meta.getURL(), conf);
             if (dclass == null)
                 dclass = DBDictionary.class.getName();
             return newDBDictionary(conf, dclass, props, conn);



Mime
View raw message