From 65433a59595e416823a22c6824b70dec86b7a811 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20M=C3=BCller?= <a.mueller@bgbm.org>
Date: Thu, 13 Jan 2011 12:37:49 +0000
Subject: [PATCH] Exception message for unestablished database connection.

---
 .../java/eu/etaxonomy/cdm/database/CdmDataSourceBase.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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 cf99a86a35..a356afe03e 100644
--- 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;
 		}
 		Connection connection = getConnection();
-		Statement statement = connection.createStatement();
-		resultSet = statement.executeQuery(query);
+		if (connection != null){
+			Statement statement = connection.createStatement();
+			resultSet = statement.executeQuery(query);
+		}else{
+			throw new RuntimeException("Could not establish connection to database");
+		}
 		return resultSet;
 
 	}
-- 
2.34.1