fix: Fixed issue in installation without guice extension

Refs: #106
SchweizerischeBundesbahnen · Sep 27, 2024 · 452fbc1 · 452fbc1
1 parent 4c9389f
commit 452fbc1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/...ain/java/ch/sbb/polarion/extension/interceptor_manager/guice/GuiceActionHooksFactory.java b/...ain/java/ch/sbb/polarion/extension/interceptor_manager/guice/GuiceActionHooksFactory.java
@@ -25,7 +25,9 @@ public static GuiceActionHooksFactory build() {
     @Inject
     @SuppressWarnings("unused")
     public void setActionHooks(Set<IActionHook> actionHooks) {
-        this.actionHooks.addAll(actionHooks);
-        logger.info("Added guice action hooks: " + actionHooks.size());
+        if (actionHooks != null) {
+            this.actionHooks.addAll(actionHooks);
+            logger.info("Added guice action hooks: " + actionHooks.size());
+        }
     }
 }
diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF
@@ -14,6 +14,7 @@ Require-Bundle: com.polarion.portal.tomcat,
  org.apache.commons.logging,
  org.apache.hivemind,
  slf4j.api
+Guice-Modules: ch.sbb.polarion.extension.interceptor_manager.guice.GuiceModule
 Import-Package: org.osgi.framework,
  org.osgi.util.tracker
 Export-Package: ch.sbb.polarion.extension.interceptor_manager,