Skip to content

Commit 9149125

Browse files
committed
[WFCORE-7079] Remove ModuleIdentifier usage from Version module
Jira issue: https://issues.redhat.com/browse/WFCORE-7079
1 parent b124810 commit 9149125

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

version/src/main/java/org/jboss/as/version/ProductConfig.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import java.util.stream.Collectors;
2727

2828
import org.jboss.modules.Module;
29-
import org.jboss.modules.ModuleIdentifier;
3029
import org.jboss.modules.ModuleLoader;
3130

3231
/**
@@ -224,7 +223,7 @@ public static String getPrettyVersionString(final String name, String version1,
224223
}
225224

226225
private void setSystemProperties(final Properties propConfProps, final Map providedProperties) {
227-
if (propConfProps.size() == 0) {
226+
if (propConfProps.isEmpty()) {
228227
return;
229228
}
230229

@@ -262,10 +261,10 @@ private static void safeClose(Closeable c) {
262261

263262
private static class ProductConfProps {
264263
private final Properties miscProperties;
265-
private final ModuleIdentifier productModuleId;
264+
private final String productModuleId;
266265

267266
private ProductConfProps(String slot) {
268-
this.productModuleId = slot == null ? null : ModuleIdentifier.create("org.jboss.as.product", slot);
267+
this.productModuleId = slot == null ? null : "main".equals(slot) ? "org.jboss.as.product" : "org.jboss.as.product:" + slot;
269268
this.miscProperties = new Properties();
270269
}
271270

0 commit comments

Comments
 (0)