fix: remove duplicate builtin services (#1314)

aws-greengrass · Sep 21, 2022 · 0ff5dc4 · 0ff5dc4
1 parent dd8e059
commit 0ff5dc4
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/main/java/com/aws/greengrass/lifecyclemanager/Kernel.java b/src/main/java/com/aws/greengrass/lifecyclemanager/Kernel.java
@@ -475,8 +475,9 @@ private GreengrassService locateGreengrassService(Context.Value v, String name,
                     ret = (GreengrassService) context.newInstance(clazz);
                 }
 
-                // Force plugins to be singletons
-                if (clazz.getAnnotation(Singleton.class) != null || PluginService.class.isAssignableFrom(clazz)) {
+                // Force plugins and built-in services to be singletons
+                if (clazz.getAnnotation(Singleton.class) != null || PluginService.class.isAssignableFrom(clazz)
+                    || clazz.getAnnotation(ImplementsService.class) != null) {
                     context.put(ret.getClass(), v);
                 }
                 if (clazz.getAnnotation(ImplementsService.class) != null) {