[Geotools-commits] svn - r36220 - in branches/2.6.x/modules/library/jdbc: . src/main/java/org/geotools/jdbc

[<svn...@os...>]

Author: aaime
Date: 2010-09-22 07:17:31 +0000 (Wed, 22 Sep 2010)
New Revision: 36220

Modified:
   branches/2.6.x/modules/library/jdbc/
   branches/2.6.x/modules/library/jdbc/src/main/java/org/geotools/jdbc/JDBCDataStore.java
Log:
[GEOT-3272] JDBCDataStore.finalize() logs inappropriatel


Property changes on: branches/2.6.x/modules/library/jdbc
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2.5.x/modules/library/main/jdbc:33331
/trunk/modules/library/jdbc:34314,34359,34367-34368,34530,34541,34561,35002,35053,35138,35342,35412,35432,35504,35552-35554,35583,35588,35734,35736,35744,35990
   + /branches/2.5.x/modules/library/main/jdbc:33331
/trunk/modules/library/jdbc:34314,34359,34367-34368,34530,34541,34561,35002,35053,35138,35342,35412,35432,35504,35552-35554,35583,35588,35734,35736,35744,35990,36219

Modified: branches/2.6.x/modules/library/jdbc/src/main/java/org/geotools/jdbc/JDBCDataStore.java
===================================================================
--- branches/2.6.x/modules/library/jdbc/src/main/java/org/geotools/jdbc/JDBCDataStore.java	2010-09-22 07:13:11 UTC (rev 36219)
+++ branches/2.6.x/modules/library/jdbc/src/main/java/org/geotools/jdbc/JDBCDataStore.java	2010-09-22 07:17:31 UTC (rev 36220)
@@ -3936,13 +3936,13 @@
         if(dataSource != null && dataSource instanceof ManageableDataSource) {
             try {
                 ManageableDataSource mds = (ManageableDataSource) dataSource; 
-                dataSource = null;
                 mds.close();
             } catch(SQLException e) {
                 // it's ok, we did our best..
                 LOGGER.log(Level.FINE, "Could not close dataSource", e);
             }
         }
+        dataSource = null;
     }
     /**
      * Checks if geometry generalization required and makes sense