Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix stop/stop or stop no start NPE on sharedfilelocker

This commit is contained in:
gtully 2015-10-20 13:02:57 +01:00
parent dc19d28af9
commit a01578ad4c
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-broker/src/main/java/org/apache/activemq/store/SharedFileLocker.java
View File

@ -99,9 +99,11 @@ public class SharedFileLocker extends AbstractLocker {
@Override @Override
public void doStop(ServiceStopper stopper) throws Exception { public void doStop(ServiceStopper stopper) throws Exception {
if (lockFile != null) {
lockFile.unlock(); lockFile.unlock();
lockFile = null; lockFile = null;
} }
}
public File getDirectory() { public File getDirectory() {
return directory; return directory;

7
activemq-unit-tests/src/test/java/org/apache/activemq/store/SharedFileLockerTest.java
View File

@ -59,6 +59,13 @@ public class SharedFileLockerTest {
} }
@Test
public void testStopNoStart() throws Exception {
SharedFileLocker locker1 = new SharedFileLocker();
locker1.setDirectory(testFolder.getRoot());
locker1.stop();
}
@Test @Test
public void testLoop() throws Exception { public void testLoop() throws Exception {
// Increase the number of iterations if you are debugging races // Increase the number of iterations if you are debugging races