App could hang on status build failure #60

Author: host6

src/main/java/org/scm4j/releaser/ExtendedStatusBuilder.java

@@ -56,8 +56,9 @@ public ExtendedStatus getAndCachePatchStatus(String coords, CachedStatuses cache
 	}
 
 	public ExtendedStatus getAndCacheStatus(Component comp, CachedStatuses cache, IProgress progress, boolean patch) {
+		VCSRepository repo = null;
 		try {
-			VCSRepository repo = repoFactory.getVCSRepository(comp);
+			repo = repoFactory.getVCSRepository(comp);
 			ExtendedStatus existing = cache.putIfAbsent(repo.getUrl(), ExtendedStatus.DUMMY);
 
 			while (ExtendedStatus.DUMMY == existing) {
@@ -83,14 +84,17 @@ public ExtendedStatus getAndCacheStatus(Component comp, CachedStatuses cache, IP
 			cache.replace(repo.getUrl(), res);
 			return res;
 		} catch (Exception e) {
+			if (repo != null) {
+				cache.remove(repo.getUrl());
+			}
 			if (e instanceof EReleaserException) {
 				throw e;
 			}
 			throw new EBuildStatus(e, comp);
 		}
 	}
 
-	private ExtendedStatus getMinorStatus(Component comp, CachedStatuses cache, IProgress progress, VCSRepository repo, DelayedTag dt) {
+	ExtendedStatus getMinorStatus(Component comp, CachedStatuses cache, IProgress progress, VCSRepository repo, DelayedTag dt) {
 		ReleaseBranchCurrent rb = reportDuration(() -> ReleaseBranchFactory.getCRB(repo), "CRB created", comp, progress);
 		Boolean hasDelayedTag = dt != null && rb.getName().equals(Utils.getReleaseBranchName(repo,  dt.getVersion()));
 		LinkedHashMap<Component, ExtendedStatus> subComponents = new LinkedHashMap<>();
@@ -154,14 +158,7 @@ private ExtendedStatus getPatchStatus(Component comp, CachedStatuses cache, IPro
 		}
 
 		ConcurrentHashMap<Component, ExtendedStatus> subComponentsLocal = new ConcurrentHashMap<>();
-		Utils.async(rb.getMDeps(), (mdep) -> {
-			try {
-				recursiveGetAndCacheStatus(cache, progress, subComponentsLocal, mdep, true);
-			} catch (Exception e) {
-				cache.remove(repo.getUrl());
-				throw e;
-			}
-		});
+		Utils.async(rb.getMDeps(), (mdep) -> recursiveGetAndCacheStatus(cache, progress, subComponentsLocal, mdep, true));
 		for (Component mdep : rb.getMDeps()) {
 			subComponents.put(mdep, subComponentsLocal.get(mdep));
 		}
@@ -254,7 +251,6 @@ private boolean areMDepsPatchesActualForPatch(Component rootComp, VCSRepository
 
 			// Any component `nextVersion`.truncatePatch is not equal to one mentioned in `mdeps` -> error (disallow minor upgrade/downgrade)
 			if (!nextVersion.toReleaseNoPatch().equals(mDep.getVersion().toReleaseNoPatch())) {
-				cache.remove(repo.getUrl());
 				throw new EMinorUpgradeDowngrade(rootComp, mDep, nextVersion.toPreviousPatch());
 			}
 
@@ -271,7 +267,6 @@ private boolean areMDepsPatchesActualForPatch(Component rootComp, VCSRepository
 
 			// Any component `nextVersion`.patch is less than one mentioned in `mdeps` -> error (patch upgrade only is allowed)
 			if (nextVersionPatch < mDepPatch) {
-				cache.remove(repo.getUrl());
 				throw new EMinorUpgradeDowngrade(rootComp, mDep, verToActualizeOn);
 			}
 
@@ -337,13 +332,6 @@ private Boolean isNeedToFork(Component comp, ReleaseBranchCurrent rb, CachedStat
 	}
 
 	private void recursiveGetAndCacheStatusAsync(ReleaseBranchCurrent rb, CachedStatuses cache, IProgress progress, VCSRepository repo, ConcurrentHashMap<Component, ExtendedStatus> subComponentsLocal) {
-		Utils.async(rb.getMDeps(), (mdep) -> {
-			try {
-				recursiveGetAndCacheStatus(cache, progress, subComponentsLocal, mdep, false);
-			} catch (Exception e) {
-				cache.remove(repo.getUrl());
-				throw e;
-			}
-		});
+		Utils.async(rb.getMDeps(), (mdep) -> recursiveGetAndCacheStatus(cache, progress, subComponentsLocal, mdep, false));
 	}
 }

src/test/java/org/scm4j/releaser/WorkflowBuildTest.java

@@ -225,4 +225,20 @@ public void testShouldRemoveFromCacheOnErrorsIsNeedToFork() {
 			verify(cache, atLeast(1)).remove(eq(repoUBL.getUrl()));
 		}
 	}
+	
+	@Test
+	public void testShouldRemoveFromCacheOnBuildStatusFailure() {
+		ExtendedStatusBuilder esb = spy(new ExtendedStatusBuilder(repoFactory));
+		CachedStatuses cache = spy(new CachedStatuses());
+		RuntimeException testException = new RuntimeException("");
+		ProgressConsole pc = new ProgressConsole();
+		doThrow(testException).when(esb).getMinorStatus(compUnTillDb, cache, pc, repoUnTillDb, null);
+		
+		try {
+			esb.getAndCacheStatus(compUBL, cache, pc, false);
+			fail();
+		} catch (RuntimeException e) {
+			verify(cache, atLeast(1)).remove(eq(repoUnTillDb.getUrl()));
+		}
+	}
 }