[#63] FIX ActivitiServiceImpl NPE on scriptRegistry

vharseko · vharseko · commit caff8ba907e9 · 2024-08-13T17:54:20.000+03:00
diff --git a/openidm-workflow-activiti/src/main/java/org/forgerock/openidm/workflow/activiti/impl/ActivitiServiceImpl.java b/openidm-workflow-activiti/src/main/java/org/forgerock/openidm/workflow/activiti/impl/ActivitiServiceImpl.java
@@ -461,7 +461,14 @@ protected void unbindProcessEngine(ProcessEngine processEngine) {
         }
         logger.info("ProcessEngine stopped.");
     }
- 
+
+    @Reference(
+            name = "ScriptRegistryService",
+            service = ScriptRegistry.class,
+            unbind = "unbindScriptRegistry",
+            cardinality = ReferenceCardinality.OPTIONAL,
+            policy = ReferencePolicy.DYNAMIC,
+            target = "(service.pid=org.forgerock.openidm.script)")
     protected void bindScriptRegistry(ScriptRegistry scriptRegistry) {
         this.idmSessionFactory.setScriptRegistry(scriptRegistry);
     }

Original file line number	Diff line number	Diff line change
`@@ -461,7 +461,14 @@ protected void unbindProcessEngine(ProcessEngine processEngine) {`
`461`	`461`	`}`
`462`	`462`	`logger.info("ProcessEngine stopped.");`
`463`	`463`	`}`
`464`		`-`
	`464`	`+`
	`465`	`+ @Reference(`
	`466`	`+ name = "ScriptRegistryService",`
	`467`	`+ service = ScriptRegistry.class,`
	`468`	`+ unbind = "unbindScriptRegistry",`
	`469`	`+ cardinality = ReferenceCardinality.OPTIONAL,`
	`470`	`+ policy = ReferencePolicy.DYNAMIC,`
	`471`	`+ target = "(service.pid=org.forgerock.openidm.script)")`
`465`	`472`	`protected void bindScriptRegistry(ScriptRegistry scriptRegistry) {`
`466`	`473`	`this.idmSessionFactory.setScriptRegistry(scriptRegistry);`
`467`	`474`	`}`