Automatic merge of master into galahad

oracle · Jul 4, 2024 · 0012f47 · 0012f47
2 parents f75c556 247c680
commit 0012f47
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/EmbeddedResourcesInfo.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/EmbeddedResourcesInfo.java
@@ -48,7 48,7 @@ public static EmbeddedResourcesInfo singleton() {
  }
 
  public void declareResourceAsRegistered(Module module, String resource, String source) {
- if (!ResourcesFeature.Options.GenerateEmbeddedResourcesFile.getValue()) {
  if (!ImageSingletons.lookup(ResourcesFeature.class).collectEmbeddedResourcesInfo()) {
  return;
  }
 

diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java
@@ -22,7 22,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package com.oracle.svm.hosted;
 
 import static com.oracle.svm.core.jdk.Resources.RESOURCES_INTERNAL_PATH_SEPARATOR;
@@ -141,7 140,7 @@
  * @see NativeImageResourceFileAttributesView
  */
 @AutomaticallyRegisteredFeature
-public final class ResourcesFeature implements InternalFeature {
 public class ResourcesFeature implements InternalFeature {
 
  static final String MODULE_NAME_ALL_UNNAMED = "ALL-UNNAMED";
 
@@ -389,6 388,10 @@ private static ResourcesRegistryImpl resourceRegistryImpl() {
  return (ResourcesRegistryImpl) ImageSingletons.lookup(ResourcesRegistry.class);
  }
 
  protected boolean collectEmbeddedResourcesInfo() {
  return Options.GenerateEmbeddedResourcesFile.getValue();
  }
 
  @Override
  public void beforeAnalysis(BeforeAnalysisAccess access) {
  /* load and parse resource configuration files */