Refactor FileRepository.detectIndexChange()

Change-Id: I50c751e2e90f685dc27043c569da2eb210d4611b
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java
index 13ef94b8984c9c655a94b6f3913e7b189c188a50..d4056871b06e7d6f37dce708032d5b11c2947892 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java
@@ -557,15 +557,15 @@ public class FileRepository extends Repository {
                try {
                        if (snapshot == null) {
                                snapshot = FileSnapshot.save(indexFile);
-                       } else if (snapshot.isModified(indexFile)) {
-                               snapshotLock.unlock();
-                               notifyIndexChanged(false);
+                               return;
                        }
-               } finally {
-                       if (snapshotLock.isHeldByCurrentThread()) {
-                               snapshotLock.unlock();
+                       if (!snapshot.isModified(indexFile)) {
+                               return;
                        }
+               } finally {
+                       snapshotLock.unlock();
                }
+               notifyIndexChanged(false);
        }
 
        /** {@inheritDoc} */