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

move back to acquire lock before opening initializing index managers 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@646877 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Davies 2008-04-10 17:13:55 +00:00
parent 334c00a6a6
commit 0e5dda068c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
activemq-core/src/main/java/org/apache/activemq/kaha/impl/KahaStore.java
View File

@ -82,6 +82,7 @@ public class KahaStore implements Store {
private long maxDataFileLength = 1024 * 1024 * 32;
private FileLock lock;
private boolean persistentIndex = true;
private RandomAccessFile lockFile;
private final AtomicLong storeSize;
private String defaultContainerName = DEFAULT_CONTAINER_NAME;
@ -110,6 +111,9 @@ public class KahaStore implements Store {
closed = true;
if (initialized) {
unlock();
if (lockFile!=null) {
lockFile.close();
}
for (ListContainerImpl container : lists.values()) {
container.close();
}
@ -468,9 +472,10 @@ public class KahaStore implements Store {
}
if (!initialized) {
LOG.info("Kaha Store using data directory " + directory);
lockFile = new RandomAccessFile(new File(directory, "lock"), "rw");
lock();
DataManager defaultDM = getDataManager(defaultContainerName);
rootIndexManager = getIndexManager(defaultDM, defaultContainerName);
lock();
IndexItem mapRoot = new IndexItem();
IndexItem listRoot = new IndexItem();
if (rootIndexManager.isEmpty()) {
@ -505,7 +510,7 @@ public class KahaStore implements Store {
String property = System.getProperty(key);
if (null == property) {
if (!BROKEN_FILE_LOCK) {
lock = rootIndexManager.getLock();
lock = lockFile.getChannel().tryLock();
if (lock == null) {
throw new StoreLockedExcpetion("Kaha Store " + directory.getName() + " is already opened by another application");
} else