Changeset 60

Timestamp:

02/26/10 23:13:22 (6 months ago)

Author:

ke

Message:

Temporary database directory is now deleted on exit.

Files:

• kahina/trunk/src/org/kahina/core/KahinaRunner.java (modified) (1 diff)
• kahina/trunk/src/org/kahina/io/database/DatabaseHandler.java (modified) (2 diffs)

kahina/trunk/src/org/kahina/core/KahinaRunner.java

@@ -9 +9 @@
-    {
-        KahinaInstance kahina = new KahinaInstance(new DbDataManager(new DatabaseHandler()));
+        System.err.println("Test.");
-    }
-}

kahina/trunk/src/org/kahina/io/database/DatabaseHandler.java

@@ -152 +152 @@
-        {
-                Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
-
+final 
-                deleteRecursively(file);
-                connection = DriverManager.getConnection("jdbc:derby:" + file.getPath()
-                                + ";create=true");
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                Statement statement = connection.createStatement();
-                try
@@ -169 +187 @@
-                                .executeUpdate("CREATE TABLE data (id BIGINT NOT NULL , value VARCHAR(32) NOT NULL, PRIMARY KEY (id))");
-                statement.close();
+        }
+        
+        /**
+         * Closes the underlying database connection. This method should always be
+         * invoked as soon as this handler is no longer needed.
+         */
+        public void close()
+        {
+                try
+                {
+                        connection.close();
+                } catch (SQLException e)
+                {
+                        throw new KahinaException("Failed to close database handler.", e);
+                }
-        }
-