remove potential NPE in CdmDataSourceBase

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmDataSourceBase.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmDataSourceBase.java
index 2c12f6227ad14ea1f3cb80131926e308914cd6be..bffc1c06b93e5b025ff5abfe0879fcd2967eedae 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmDataSourceBase.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmDataSourceBase.java
@@ -76,10 +76,6 @@ abstract class CdmDataSourceBase extends CdmSource implements ICdmDataSource  {
         return null;\r
     }\r
 \r
-\r
-    /* (non-Javadoc)\r
-     * @see eu.etaxonomy.cdm.database.ICdmDataSource#testConnection()\r
-     */\r
     @Override\r
     public boolean testConnection() throws ClassNotFoundException, SQLException {\r
 \r
@@ -197,10 +193,6 @@ abstract class CdmDataSourceBase extends CdmSource implements ICdmDataSource  {
 \r
     }\r
 \r
-\r
-    /* (non-Javadoc)\r
-     * @see eu.etaxonomy.cdm.database.ICdmDataSource#executeUpdate(java.lang.String)\r
-     */\r
     @Override\r
     public int executeUpdate (String sqlUpdate) throws SQLException{\r
 \r
@@ -216,7 +208,7 @@ abstract class CdmDataSourceBase extends CdmSource implements ICdmDataSource  {
             return result;\r
         } catch(SQLException e) {\r
             try{\r
-                if (! connection.getAutoCommit()){\r
+                if (connection != null && ! connection.getAutoCommit()){\r
                     connection.rollback();\r
                 }\r
             }catch (SQLException ex){\r
@@ -228,10 +220,6 @@ abstract class CdmDataSourceBase extends CdmSource implements ICdmDataSource  {
         }\r
     }\r
 \r
-\r
-    /* (non-Javadoc)\r
-     * @see eu.etaxonomy.cdm.database.ICdmDataSource#startTransaction()\r
-     */\r
     @Override\r
     public void startTransaction() {\r
         try {\r
@@ -245,9 +233,6 @@ abstract class CdmDataSourceBase extends CdmSource implements ICdmDataSource  {
         }\r
     }\r
 \r
-    /* (non-Javadoc)\r
-     * @see eu.etaxonomy.cdm.database.ICdmDataSource#commitTransaction()\r
-     */\r
     @Override\r
     public void commitTransaction() throws SQLException {\r
         try {\r
@@ -270,9 +255,7 @@ abstract class CdmDataSourceBase extends CdmSource implements ICdmDataSource  {
         }\r
     }\r
 \r
-    /* (non-Javadoc)\r
-     * @see eu.etaxonomy.cdm.database.ICdmDataSource#getMetaData()\r
-     */\r
+\r
     @Override\r
     public DatabaseMetaData getMetaData() {\r
         Connection connection = null;\r
@@ -285,9 +268,6 @@ abstract class CdmDataSourceBase extends CdmSource implements ICdmDataSource  {
         }\r
     }\r
 \r
-    /* (non-Javadoc)\r
-     * @see eu.etaxonomy.cdm.database.ICdmDataSource#closeOpenConnections()\r
-     */\r
     @Override\r
     public void closeOpenConnections() {\r
         try {\r
@@ -386,6 +366,5 @@ abstract class CdmDataSourceBase extends CdmSource implements ICdmDataSource  {
                }\r
                return cdmMetaDataMap;\r
     }\r
-\r
-    \r
+ \r
 }\r