From e8fe7541cc10c0ab876f932ea0638404d4ecf114 Mon Sep 17 00:00:00 2001
From: Max Schenkelberg <max.schenkelberg@raytheon.com>
Date: Mon, 7 Jan 2013 16:04:14 -0600
Subject: [PATCH] Issue #1329 fixed bug in FileLocker

Change-Id: Ide1f4cb2d9f5d6f6ebfb2eed8bac583f0b0e153e

Former-commit-id: 5f66889a5cd8484f5a27466122556ffb136b7d24 [formerly ebb303ee06636c6a14aead5a6aa92df930fa0b47] [formerly d779a82c5eb74e7fc8eb45ba2671dd59929d2047] [formerly 5f66889a5cd8484f5a27466122556ffb136b7d24 [formerly ebb303ee06636c6a14aead5a6aa92df930fa0b47] [formerly d779a82c5eb74e7fc8eb45ba2671dd59929d2047] [formerly 91a8e56302f925c368a4d35aabd8952b8102b23d [formerly d779a82c5eb74e7fc8eb45ba2671dd59929d2047 [formerly 695f92db8aa698393bebfb4c2fed0bcf4d9d4efa]]]]
Former-commit-id: 91a8e56302f925c368a4d35aabd8952b8102b23d
Former-commit-id: e8445dbd341dbce779ea2bd32758fc13d459095a [formerly 06004a0e08689b413151617377e2e1a8353e99f3] [formerly cf7d190ae2b6f26ce5d3b1b3e829d8885e3af0cf [formerly 66f472ed37334c739d71ff16fb7f3d01bd0320f8]]
Former-commit-id: a17dfbf28b6ff9e267571e77b35b50936e317386 [formerly 8745f7acf1c5326699e1577fa9bb78fe4253da59]
Former-commit-id: 85e82e4b7888130168c7b59fc9bae75984ddf197
---
 .../raytheon/uf/common/localization/FileLocker.java    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/FileLocker.java b/edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/FileLocker.java
index 09980ff99c..e71e9d5574 100644
--- a/edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/FileLocker.java
+++ b/edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/FileLocker.java
@@ -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) {