From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 29 May 2023 11:14:18 +0000 (+0200)
Subject: Make A2 variant search more robust
X-Git-Tag: v2.3.17~8
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=ba0976a5394ee929793d8240d500fa59deca01c3;p=lgpl%2Fargeo-commons.git

Make A2 variant search more robust
---

diff --git a/org.argeo.init/src/org/argeo/init/a2/FsA2Source.java b/org.argeo.init/src/org/argeo/init/a2/FsA2Source.java
index e0e2e437f..151b0023f 100644
--- a/org.argeo.init/src/org/argeo/init/a2/FsA2Source.java
+++ b/org.argeo.init/src/org/argeo/init/a2/FsA2Source.java
@@ -61,20 +61,22 @@ public class FsA2Source extends AbstractProvisioningSource implements A2Source {
 					if (variantPath == null)
 						continue contributions;
 
-					// a variant was found, let's collect its contributions (also common ones in its
-					// parent)
-					for (Path variantContributionPath : Files.newDirectoryStream(variantPath.getParent())) {
-						String variantContributionId = variantContributionPath.getFileName().toString();
-						if (variantContributionId.contains(".")) {
-							A2Contribution contribution = getOrAddContribution(variantContributionId);
-							contributions.put(variantContributionPath, contribution);
+					if (Files.exists(variantPath)) {
+						// a variant was found, let's collect its contributions (also common ones in its
+						// parent)
+						for (Path variantContributionPath : Files.newDirectoryStream(variantPath.getParent())) {
+							String variantContributionId = variantContributionPath.getFileName().toString();
+							if (variantContributionId.contains(".")) {
+								A2Contribution contribution = getOrAddContribution(variantContributionId);
+								contributions.put(variantContributionPath, contribution);
+							}
 						}
-					}
-					for (Path variantContributionPath : Files.newDirectoryStream(variantPath)) {
-						String variantContributionId = variantContributionPath.getFileName().toString();
-						if (variantContributionId.contains(".")) {
-							A2Contribution contribution = getOrAddContribution(variantContributionId);
-							contributions.put(variantContributionPath, contribution);
+						for (Path variantContributionPath : Files.newDirectoryStream(variantPath)) {
+							String variantContributionId = variantContributionPath.getFileName().toString();
+							if (variantContributionId.contains(".")) {
+								A2Contribution contribution = getOrAddContribution(variantContributionId);
+								contributions.put(variantContributionPath, contribution);
+							}
 						}
 					}
 				}