Skip to content
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

Jump to bottom

fix(agama): avoid NPE when configuration is missing #2863

Merged
merged 1 commit into from
Nov 4, 2022
Merged

fix(agama): avoid NPE when configuration is missing #2863

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
10 changes: 2 additions & 8 deletions agama/engine/src/main/java/io/jans/agama/engine/service/AppInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,8 @@
import jakarta.enterprise.event.Observes;
import jakarta.inject.Inject;

import org.slf4j.Logger;

@ApplicationScoped
public class AppInitializer {

@Inject
private Logger logger;

@Inject
private Transpilation trTimer;
Expand All @@ -25,11 +20,10 @@ public class AppInitializer {

public void run(@Observes @ApplicationInitialized(ApplicationScoped.class)
ApplicationInitializedEvent event) {

logger.info("Initializing Agama services");

trTimer.initTimer();
fcleaner.initTimer();

}

}
13 changes: 10 additions & 3 deletions agama/engine/src/main/java/io/jans/agama/engine/service/ServicesFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,16 @@ public EngineConfig engineConfigInstance() {
public void updateConfiguration(@Observes @ConfigurationUpdate AppConfiguration appConfiguration) {

try {
logger.info("Refreshing Agama configuration...");
BeanUtils.copyProperties(econfig, appConfiguration.getAgamaConfiguration());
serializerFactory.refresh();
EngineConfig newConfig = appConfiguration.getAgamaConfiguration();

if (newConfig == null) {
logger.info("Agama will not be available in this deployment");

} else {
logger.info("Refreshing Agama configuration...");
BeanUtils.copyProperties(econfig, newConfig);
serializerFactory.refresh();
}
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
Expand Down