FELIX-6072 NPE fix

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1854490 13f79535-47bb-0310-9956-ffa450edef68
apache · Feb 27, 2019 · 99a2fe7 · 99a2fe7
1 parent ad2aabb
commit 99a2fe7
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/...eralchecks/src/main/java/org/apache/felix/hc/generalchecks/util/ScriptEnginesTracker.java b/...eralchecks/src/main/java/org/apache/felix/hc/generalchecks/util/ScriptEnginesTracker.java
@@ -110,13 +110,14 @@ private void registerFactories(Bundle bundle) {
 
     private void unregisterFactories(Bundle bundle) {
         List<String> languagesForBundle = languagesByBundle.get(bundle);
-        for (String lang : languagesForBundle) {
-            ScriptEngineFactory removed = enginesByLanguage.remove(lang);
-            LOG.info("Removing ScriptEngine {} for language {}", removed, lang);
+        if(languagesForBundle != null) {
+            for (String lang : languagesForBundle) {
+                ScriptEngineFactory removed = enginesByLanguage.remove(lang);
+                LOG.info("Removing ScriptEngine {} for language {}", removed, lang);
+            }
         }
     }
 
-
     @SuppressWarnings("unchecked")
     private List<ScriptEngineFactory> getScriptEngineFactoriesForBundle(final Bundle bundle) {
         URL url = bundle.getEntry(ENGINE_FACTORY_SERVICE);