[Geotools-commits] svn - r38799 - trunk/modules/library/jdbc/src/main/java/org/geotools/jdbc

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

Author: jive
Date: 2012-06-06 01:54:14 -0700 (Wed, 06 Jun 2012)
New Revision: 38799

Modified:
   trunk/modules/library/jdbc/src/main/java/org/geotools/jdbc/JDBCDataStore.java
Log:
Improvided NPE getConnection() message as per GEOT-4165

Modified: trunk/modules/library/jdbc/src/main/java/org/geotools/jdbc/JDBCDataStore.java
===================================================================
--- trunk/modules/library/jdbc/src/main/java/org/geotools/jdbc/JDBCDataStore.java	2012-06-06 02:56:09 UTC (rev 38798)
+++ trunk/modules/library/jdbc/src/main/java/org/geotools/jdbc/JDBCDataStore.java	2012-06-06 08:54:14 UTC (rev 38799)
@@ -1646,6 +1646,9 @@
     protected final Connection createConnection() {
         try {
             LOGGER.fine( "CREATE CONNECTION");
+            if( getDataSource() == null ){
+                throw new NullPointerException("JDBC DataSource not available after dispose() has been called");
+            }
             Connection cx = getDataSource().getConnection();
             // isolation level is not set in the datastore, see 
             // http://jira.codehaus.org/browse/GEOT-2021