Update BazelLockFileFunction.java

bazelbuild · Nov 25, 2023 · 49ffe07 · 49ffe07
1 parent 223dc18
commit 49ffe07
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelLockFileFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelLockFileFunction.java
@@ -116,7 +116,7 @@ public static BazelLockFileValue getLockfileValue(RootedPath lockfilePath) throw
           // Happy path, the lockfile could be parsed and has the correct version.
           return bazelLockFileValue;
         }
-      } catch (JsonSyntaxException e1) {
+      } catch (JsonSyntaxException e) {
         // The lockfile is not a valid JSON encoding of a BazelLockFileValue or not valid JSON at
         // all. Try to read just the lockfile version to report better messages in error mode.
         try (var reader =
@@ -127,9 +127,13 @@ public static BazelLockFileValue getLockfileValue(RootedPath lockfilePath) throw
               Optional.ofNullable(jsonObject.get(LOCK_FILE_VERSION_KEY))
                   .map(JsonElement::getAsInt)
                   .orElse(-1);
-        } catch (NumberFormatException e2) {
+        } catch (NumberFormatException unused) {
           version = -1;
         }
+        if (version == BazelLockFileValue.LOCK_FILE_VERSION) {
+          // Invalid lockfile, but correct version.
+          throw e;
+        }
       }
       // This is an old version, needs to be updated
       // Keep old version to recognize the problem in error mode