1 files changed, 36 insertions, 21 deletions
diff --git a/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/cassandra/CassandraSession.java b/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/cassandra/CassandraSession.java
index 7a9faf7b43..186d9f8d1a 100644
--- a/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/cassandra/CassandraSession.java
+++ b/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/cassandra/CassandraSession.java
@@ -20,31 +20,46 @@ package org.apache.tuscany.nosqldatastore.cassandra;
 
 import me.prettyprint.cassandra.service.CassandraHostConfigurator;
 import me.prettyprint.hector.api.Cluster;
+import me.prettyprint.hector.api.exceptions.HInvalidRequestException;
+import me.prettyprint.hector.api.exceptions.HectorException;
 import me.prettyprint.hector.api.factory.HFactory;
 import org.apache.tuscany.nosqldatastore.Database;
 import org.apache.tuscany.nosqldatastore.Session;
+import org.apache.tuscany.nosqldatastore.exception.DatabaseNotFoundException;
+import org.apache.tuscany.nosqldatastore.exception.GroupNotFoundException;
+import org.apache.tuscany.nosqldatastore.exception.SessionException;
 
 public class CassandraSession implements Session {
-	
-	private CassandraHostConfigurator cassandraHostConfigurator;
-	private Cluster cluster;
-	
-	public CassandraSession(String clusterName) {
-		cluster = HFactory.getOrCreateCluster("Test Cluster", "127.0.0.1:9160");
-	}
-
-	public Database createDatabase(String keyspaceName) {
-		Database database = new CassandraDatabase(keyspaceName, cluster);
-		return database;
-	}
-
-	public Database getDatabase(String keyspaceName) {
-		Database database = new CassandraDatabase(keyspaceName, cluster);
-		return database;
-	}
-
-	public void deleteDatabase(String keyspaceName) {
-		cluster.dropKeyspace(keyspaceName);
-	}
+
+    private CassandraHostConfigurator cassandraHostConfigurator;
+    private Cluster cluster;
+
+    public CassandraSession(String clusterName) {
+        cluster = HFactory.getOrCreateCluster("Test Cluster", "127.0.0.1:9160");
+    }
+
+    public Database createDatabase(String databaseName) throws SessionException {
+        Database database = null;
+        try{
+            database = new CassandraDatabase(databaseName, cluster);
+        } catch (HectorException e){
+            throw new SessionException("Session error");
+        }
+        return database;
+    }
+
+    public Database getDatabase(String databaseName) throws SessionException {
+        return createDatabase(databaseName);
+    }
+
+    public void deleteDatabase(String databaseName) throws DatabaseNotFoundException, SessionException {
+        try{
+            cluster.dropKeyspace(databaseName);
+        } catch(HInvalidRequestException e){
+            throw new DatabaseNotFoundException("Database "+databaseName+" not found");
+        } catch (HectorException e){
+            throw new SessionException("Session error");
+        }
+    }
 
 }