- Setup keystores for ssl used by ConfigTest.java

- Prevented NullPointerException in MemoryPersistenceAdapter

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386769 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Adrian T. Co 2006-03-18 00:13:56 +00:00
parent 9920d70580
commit 4f7235d964
4 changed files with 13 additions and 1 deletions

View File

@ -125,7 +125,10 @@ public class MemoryPersistenceAdapter implements PersistenceAdapter {
store.delete();
}
}
transactionStore.delete();
if (transactionStore != null) {
transactionStore.delete();
}
}
public boolean isUseExternalMessageReferences() {

View File

@ -51,6 +51,15 @@ public class ConfigTest extends TestCase {
protected static final String DERBY_ROOT = "target/test-data/";
protected static final String CONF_ROOT = "src/sample-conf/";
static {
System.setProperty("javax.net.ssl.trustStore", "src/test/resources/client.keystore");
System.setProperty("javax.net.ssl.trustStorePassword", "password");
System.setProperty("javax.net.ssl.trustStoreType", "jks");
System.setProperty("javax.net.ssl.keyStore", "src/test/resources/server.keystore");
System.setProperty("javax.net.ssl.keyStorePassword", "password");
System.setProperty("javax.net.ssl.keyStoreType", "jks");
}
/*
* IMPORTANT NOTE: Assertions checking for the existence of the derby directory will fail if the first derby
* directory is not created under target/test-data/. The test in unable to change the derby

Binary file not shown.

Binary file not shown.