Skip to content

fix: wait for the configuration to activate GraalVMEngine #635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dgriffon merged 1 commit into from
Feb 11, 2026
Merged

fix: wait for the configuration to activate GraalVMEngine #635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ...ava/src/main/java/org/jahia/modules/javascript/modules/engine/jsengine/GraalVMEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
/**
* Base JS engine based on GraalVM
*/
@Component(service = GraalVMEngine.class, immediate = true)
@Component(service = GraalVMEngine.class, immediate = true, configurationPolicy = ConfigurationPolicy.REQUIRE)
public class GraalVMEngine {
private static final Logger logger = LoggerFactory.getLogger(GraalVMEngine.class);

Expand Down Expand Up @@ -101,7 +101,7 @@ public void disableJavascriptModule(Bundle bundle) {

@Activate
public void activate(BundleContext bundleContext, Map<String, ?> props) {
logger.debug("GraalVMEngine.activate");
logger.info("Registering GraalVMEngine");
this.bundleContext = bundleContext;

try {
Expand All @@ -126,6 +126,7 @@ public void activate(BundleContext bundleContext, Map<String, ?> props) {
}
sharedEngine = builder.build();
initializePool(poolOptions);
logger.info("Registered GraalVMEngine");
}

@Deactivate
Expand All @@ -134,6 +135,7 @@ public void deactivate() {
pool.close();
sharedEngine.close(true);
currentContext.remove();
logger.info("Unregistered GraalVMEngine");
}

public <T> T doWithContext(Function<ContextProvider, T> callback) {
Expand Down
7 changes: 7 additions & 0 deletions .../src/main/java/org/jahia/modules/javascript/modules/engine/registrars/ViewsRegistrar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.annotations.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.jcr.RepositoryException;
import javax.jcr.nodetype.NoSuchNodeTypeException;
Expand All @@ -40,6 +42,8 @@
@Component(immediate = true, service = {ViewsRegistrar.class, Registrar.class, ScriptResolver.class, JahiaEventListener.class})
public class ViewsRegistrar implements ScriptResolver, TemplateResolver, Registrar, JahiaEventListener<EventObject> {

private static final Logger logger = LoggerFactory.getLogger(ViewsRegistrar.class);

private static final Class<EventObject>[] ACCEPTED_EVENT_TYPES = new Class[] {
JahiaTemplateManagerService.TemplatePackageRedeployedEvent.class,
JahiaTemplateManagerService.ModuleDeployedOnSiteEvent.class,
Expand All @@ -65,13 +69,15 @@ public void setGraalVMEngine(GraalVMEngine graalVMEngine) {

@Activate
public void activate(BundleContext context) {
logger.info("Registering ViewsRegistrar");
List<ScriptResolver> scriptResolvers = new ArrayList<>(renderService.getScriptResolvers());
scriptResolvers.add(0, this);
renderService.setScriptResolvers(scriptResolvers);

List<TemplateResolver> templateResolvers = new ArrayList<>(renderService.getTemplateResolvers());
templateResolvers.add(0, this);
renderService.setTemplateResolvers(templateResolvers);
logger.info("Registered ViewsRegistrar");
}

@Deactivate
Expand All @@ -83,6 +89,7 @@ public void deactivate(BundleContext context) {
List<TemplateResolver> templateResolvers = new ArrayList<>(renderService.getTemplateResolvers());
templateResolvers.remove(this);
renderService.setTemplateResolvers(templateResolvers);
logger.info("Unregistered ViewsRegistrar");
}
@Override
public void register(Bundle bundle) {
Expand Down
Loading