Exception message for unestablished database connection.

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 cf99a86a35d70e93dfe879f69686343bde8ab26d..a356afe03ea3b83c2667268922dfc2a59cc40d37 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
@@ -103,8 +103,12 @@ abstract class CdmDataSourceBase implements ICdmDataSource {
                        return null;\r
                }\r
                Connection connection = getConnection();\r
-               Statement statement = connection.createStatement();\r
-               resultSet = statement.executeQuery(query);\r
+               if (connection != null){\r
+                       Statement statement = connection.createStatement();\r
+                       resultSet = statement.executeQuery(query);\r
+               }else{\r
+                       throw new RuntimeException("Could not establish connection to database");\r
+               }\r
                return resultSet;\r
 \r
        }\r