From da3174cf98c97eb5736b1c1d414e42590a819f15 Mon Sep 17 00:00:00 2001
From: gtully <gary.tully@gmail.com>
Date: Thu, 18 Jun 2015 16:12:57 +0100
Subject: [PATCH] ensure data dir is empty for test as derby needs clean dir

---
 .../activemq/store/jdbc/JDBCNetworkBrokerDetachTest.java  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCNetworkBrokerDetachTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCNetworkBrokerDetachTest.java
index aa56862bf1..8a19397ad6 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCNetworkBrokerDetachTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCNetworkBrokerDetachTest.java
@@ -16,12 +16,15 @@
  */
 package org.apache.activemq.store.jdbc;
 
+import java.io.File;
 import java.sql.SQLException;
 import java.util.LinkedList;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.network.NetworkBrokerDetachTest;
+import org.apache.activemq.util.IOHelper;
 import org.apache.derby.jdbc.EmbeddedDataSource;
 import org.junit.After;
+import org.junit.BeforeClass;
 
 public class JDBCNetworkBrokerDetachTest extends NetworkBrokerDetachTest {
 
@@ -55,4 +58,9 @@ public class JDBCNetworkBrokerDetachTest extends NetworkBrokerDetachTest {
         }
         dataSources.clear();
     }
+
+    @BeforeClass
+    public static void ensureDerbyHasCleanDirectory() throws Exception {
+        IOHelper.delete(new File(IOHelper.getDefaultDataDirectory()));
+    }
 }