commit c7ec343fd033e8c57f3ac93b9c9bee0016002da6
author Edwin Kempin <ekempin@google.com> Tue Oct 10 07:22:14 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 10 07:22:14 2017 +0000
tree 71bc3c02a850300702c55839b9c6f1a04b7ec3df
parent e970e49ff4920f7020ccc6649f28f30f3a2f4765
parent 0b505e9bdd0d4845869b0d2334cc91c182e23f4a

Merge "Don't try to create repository when it already exists"

gerrit-server/src/main/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java
index be11a59..23f2526 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java
@@ -158,7 +158,6 @@
     }
 
     File dir = FileKey.resolve(path.resolve(name.get()).toFile(), FS.DETECTED);
-    FileKey loc;
     if (dir != null) {
       // Already exists on disk, use the repository we found.
       //
@@ -168,15 +167,15 @@
         throw new RepositoryCaseMismatchException(name);
       }
 
-      loc = FileKey.exact(dir, FS.DETECTED);
-    } else {
-      // It doesn't exist under any of the standard permutations
-      // of the repository name, so prefer the standard bare name.
-      //
-      String n = name.get() + Constants.DOT_GIT_EXT;
-      loc = FileKey.exact(path.resolve(n).toFile(), FS.DETECTED);
+      throw new IllegalStateException("Repository already exists: " + name);
     }
 
+    // It doesn't exist under any of the standard permutations
+    // of the repository name, so prefer the standard bare name.
+    //
+    String n = name.get() + Constants.DOT_GIT_EXT;
+    FileKey loc = FileKey.exact(path.resolve(n).toFile(), FS.DETECTED);
+
     try {
       Repository db = RepositoryCache.open(loc, false);
       db.create(true /* bare */);