[ issue #10 ] Proper dictionary unregistration when ClientShutDownHook

executes close()
spaziocodice · Sep 3, 2014 · fe4882b · fe4882b
1 parent 7ff0cb7
commit fe4882b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/...andra/src/main/java/org/gazzax/labs/jena/nosql/cassandra/CassandraClientShutdownHook.java b/...andra/src/main/java/org/gazzax/labs/jena/nosql/cassandra/CassandraClientShutdownHook.java
@@ -1,5 +1,6 @@
 package org.gazzax.labs.jena.nosql.cassandra;
 
+import org.gazzax.labs.jena.nosql.fwk.dictionary.TopLevelDictionary;
 import org.gazzax.labs.jena.nosql.fwk.factory.ClientShutdownHook;
 import org.gazzax.labs.jena.nosql.fwk.log.Log;
 import org.gazzax.labs.jena.nosql.fwk.log.MessageCatalog;
@@ -16,14 +17,17 @@
 public class CassandraClientShutdownHook implements ClientShutdownHook {
 	private static final Log LOGGER = new Log(LoggerFactory.getLogger(ClientShutdownHook.class));
 	private final Session session;
+	final TopLevelDictionary dictionary;
 
 	/**
 	 * Builds a new Cassandra Client shutdown hook.
 	 * 
 	 * @param session the connection to Cassandra.
+	 * @param dictionary the dictionary in use.
 	 */
-	public CassandraClientShutdownHook(final Session session) {
+	public CassandraClientShutdownHook(final Session session, final TopLevelDictionary dictionary) {
 		this.session = session;
+		this.dictionary = dictionary;
 	}
 
 	@Override
@@ -33,5 +37,6 @@ public void close() {
 		} catch (final Exception exception) {
 			LOGGER.error(MessageCatalog._00099_CLIENT_SHUTDOWN_FAILURE, exception);
 		}
+		dictionary.close();
 	}
 }
diff --git a/...ndra/src/main/java/org/gazzax/labs/jena/nosql/cassandra/CassandraStorageLayerFactory.java b/...ndra/src/main/java/org/gazzax/labs/jena/nosql/cassandra/CassandraStorageLayerFactory.java
@@ -166,7 +166,7 @@ public TopLevelDictionary getDictionary() {
 
 	@Override
 	public ClientShutdownHook getClientShutdownHook() {
-		return new CassandraClientShutdownHook(session);
+		return new CassandraClientShutdownHook(session, dictionary);
 	}
 
 	@Override