Skip to content

Commit 5d39ecc

Browse files
authored
FIX NPE org.activiti.osgi.Extender.getBundleContext() is null (#99)
1 parent dd8d96b commit 5d39ecc

File tree

1 file changed

+20
-16
lines changed

1 file changed

+20
-16
lines changed

openidm-workflow-activiti/src/main/java/org/forgerock/openidm/workflow/activiti/impl/ActivitiServiceImpl.java

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -477,25 +477,29 @@ protected void unbindProcessEngine(ProcessEngine processEngine) {
477477
target = "(service.pid=org.forgerock.openidm.script)")
478478
protected void bindScriptRegistry(ScriptRegistry scriptRegistry) {
479479
this.idmSessionFactory.setScriptRegistry(scriptRegistry);
480-
Extender.getBundleContext().registerService(Extender.ScriptEngineResolver.class, new ServiceFactory<Extender.ScriptEngineResolver>() {
481-
@Override
482-
public Extender.ScriptEngineResolver getService(Bundle bundle, ServiceRegistration<Extender.ScriptEngineResolver> serviceRegistration) {
483-
return new Extender.ScriptEngineResolver() {
484-
@Override
485-
public ScriptEngine resolveScriptEngine(String s) {
486-
if (!"groovy".equalsIgnoreCase(s)) {
487-
throw new RuntimeException("unknown resolveScriptEngine "+s);
480+
if (Extender.getBundleContext()!=null) {
481+
Extender.getBundleContext().registerService(Extender.ScriptEngineResolver.class, new ServiceFactory<Extender.ScriptEngineResolver>() {
482+
@Override
483+
public Extender.ScriptEngineResolver getService(Bundle bundle, ServiceRegistration<Extender.ScriptEngineResolver> serviceRegistration) {
484+
return new Extender.ScriptEngineResolver() {
485+
@Override
486+
public ScriptEngine resolveScriptEngine(String s) {
487+
if (!"groovy".equalsIgnoreCase(s)) {
488+
throw new RuntimeException("unknown resolveScriptEngine " + s);
489+
}
490+
return new org.codehaus.groovy.jsr223.GroovyScriptEngineImpl();
488491
}
489-
return new org.codehaus.groovy.jsr223.GroovyScriptEngineImpl();
490-
}
491-
};
492-
};
492+
};
493+
}
493494

494-
@Override
495-
public void ungetService(Bundle bundle, ServiceRegistration<Extender.ScriptEngineResolver> serviceRegistration, Extender.ScriptEngineResolver scriptEngineResolver) {
495+
;
496496

497-
}
498-
},null);
497+
@Override
498+
public void ungetService(Bundle bundle, ServiceRegistration<Extender.ScriptEngineResolver> serviceRegistration, Extender.ScriptEngineResolver scriptEngineResolver) {
499+
500+
}
501+
}, null);
502+
}
499503
}
500504

501505
protected void unbindScriptRegistry(ScriptRegistry scriptRegistry) {

0 commit comments

Comments
 (0)