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 2008/10/21 04:11:41 UTC

svn commit: r706494 - /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java

Author: faywang
Date: Mon Oct 20 19:11:41 2008
New Revision: 706494

URL: http://svn.apache.org/viewvc?rev=706494&view=rev
Log:
OPENJPA-745: raise string right truncation error for Sybase. Move
the call to _dict.initializedSettings inside the block of 
checking whether _conn is null in JDBCStoreManager.

Modified:
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java?rev=706494&r1=706493&r2=706494&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java Mon Oct 20 19:11:41 2008
@@ -916,11 +916,12 @@
         try {
             // connect if the connection is currently null, or if
             // the connection has been closed out from under us
-            if (_conn == null)
+            if (_conn == null){
                 _conn = connectInternal();
+                _dict.initializeSettings(_conn);
+            }
             if (ref)
                 _conn.ref();
-            _dict.initializeSettings(_conn);
         } catch (SQLException se) {
             throw SQLExceptions.getStore(se, _dict);
         } finally {