[brooklyn-server] branch master updated: fix path on MANIFEST.MF check

[he...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git


The following commit(s) were added to refs/heads/master by this push:
     new 52ff7cb  fix path on MANIFEST.MF check
52ff7cb is described below

commit 52ff7cb04a040be6c469332f6da3f3008667eaab
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Tue Nov 24 21:04:19 2020 +0000

    fix path on MANIFEST.MF check
---
 .../apache/brooklyn/core/catalog/internal/CatalogInitialization.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogInitialization.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogInitialization.java
index 09c9146..669ab17 100644
--- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogInitialization.java
+++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogInitialization.java
@@ -541,7 +541,7 @@ public class CatalogInitialization implements ManagementContextInjectable {
         MutableSet.copyOf(bundlesInOrder).stream().filter(b -> b.getBundle()!=null && b.getBundle().getResource("/catalog.bom")!=null).forEach(b -> {
             bundlesInOrder.remove(b); bundlesInOrder.add(b); // then move catalog.bom items to the end
         });
-        MutableSet.copyOf(bundlesInOrder).stream().filter(b -> b.getBundle()!=null && b.getBundle().getResource("/OSGI-INF/MANIFEST.MF")==null).forEach(b -> {
+        MutableSet.copyOf(bundlesInOrder).stream().filter(b -> b.getBundle()!=null && b.getBundle().getResource("/META-INF/MANIFEST.MF")==null).forEach(b -> {
             bundlesInOrder.remove(b); bundlesInOrder.add(b); // move non-osgi items to the end
         });
         if (!bundlesInOrder.isEmpty()) {