Merge pull request #11230 from keithc-ca/boot7

Enable use of a Java 7 bootjdk
eclipse-openj9 · Nov 19, 2020 · bff22d2 · bff22d2
2 parents 2981dcb + 4f89f8f
commit bff22d2
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/StructureReader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/StructureReader.java
@@ -216,7 +216,7 @@ public String getPackageName(PackageNameType type) {
 	}
 
 	private void applyAliases() throws IOException {
-		Map<String, String> aliasMap = loadAliasMap(() -> getAliasVersion());
+		Map<String, String> aliasMap = loadAliasMap(getAliasVersion());
 
 		for (StructureDescriptor thisStruct : structures.values()) {
 			for (FieldDescriptor thisField : thisStruct.fields) {
@@ -226,11 +226,11 @@ private void applyAliases() throws IOException {
 	}
 
 	public static Map<String, String> loadAliasMap(long version) throws IOException {
-		return loadAliasMap(() -> Long.toString(version));
+		return loadAliasMap(Long.toString(version));
 	}
 
-	private static Map<String, String> loadAliasMap(Supplier<String> versionSupplier) throws IOException {
-		String mapData = loadAliasMapData(versionSupplier);
+	private static Map<String, String> loadAliasMap(String version) throws IOException {
+		String mapData = loadAliasMapData(version);
 
 		mapData = stripComments(mapData);
 
@@ -268,8 +268,8 @@ private String getAliasVersion() {
 		return version + variant;
 	}
 
-	private static String loadAliasMapData(Supplier<String> versionSupplier) throws IOException {
-		String streamAliasMapResource = "/com/ibm/j9ddr/StructureAliases" + versionSupplier.get() + ".dat";
+	private static String loadAliasMapData(String version) throws IOException {
+		String streamAliasMapResource = "/com/ibm/j9ddr/StructureAliases" + version + ".dat";
 		InputStream is = StructureReader.class.getResourceAsStream(streamAliasMapResource);
 
 		if (null == is) {