Merge "Issue #1329 fixed bug in FileLocker" into development

Former-commit-id: 27a96cf383 [formerly 27a96cf383 [formerly 079e2ac290f6d914b103be4ebec0420c2f9f0a93]]
Former-commit-id: f77cf10fea
Former-commit-id: f160900fe5
This commit is contained in:
Nate Jensen 2013-01-08 10:30:21 -06:00 committed by Gerrit Code Review
commit 4a020340ee

View file

@ -340,10 +340,12 @@ public class FileLocker {
gotLock = lockFile.createNewFile()
|| ((fileTime = lockFile.lastModified()) > 0 && (System
.currentTimeMillis() - fileTime) > MAX_WAIT);
try {
Thread.sleep(waitInterval);
} catch (InterruptedException e) {
// Ignore
if (!gotLock) {
try {
Thread.sleep(waitInterval);
} catch (InterruptedException e) {
// Ignore
}
}
}
} catch (IOException e) {