Merge pull request #552 from vishnusarathashling/master

ilg-ul · web-flow · commit 25262649a7d5 · 2023-02-06T08:05:56.000+02:00
[#551] Fixing issue with existing projects using old toolchain id shows error after upgrade
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.core/src/org/eclipse/embedcdt/managedbuild/cross/core/preferences/PersistentPreferences.java b/plugins/org.eclipse.embedcdt.managedbuild.cross.core/src/org/eclipse/embedcdt/managedbuild/cross/core/preferences/PersistentPreferences.java
@@ -163,8 +163,10 @@ public String getToolchainPath(String toolchainId, String toolchainName, IProjec
 		if (value != null && !value.isEmpty()) {
 			return value;
 		}
-
-		return "";
+		// This could be a project using toolchain id created
+		// using old hash mechanism, so just trying to get the
+		// toolchain path using just the toolchain name.
+		return getToolchainPath(toolchainName, project);
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -163,8 +163,10 @@ public String getToolchainPath(String toolchainId, String toolchainName, IProjec`
`163`	`163`	`if (value != null && !value.isEmpty()) {`
`164`	`164`	`return value;`
`165`	`165`	`}`
`166`		`-`
`167`		`- return "";`
	`166`	`+ // This could be a project using toolchain id created`
	`167`	`+ // using old hash mechanism, so just trying to get the`
	`168`	`+ // toolchain path using just the toolchain name.`
	`169`	`+ return getToolchainPath(toolchainName, project);`
`168`	`170`	`}`
`169`	`171`
`170`	`172`	`/**`