fix: avoid not-breaking exception ojn loading class from another bundle

vaadin · Mar 16, 2021 · 7d477e3 · 7d477e3
1 parent c6aeb67
commit 7d477e3
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/flow-server/src/main/java/com/vaadin/flow/server/osgi/VaadinBundleTracker.java b/flow-server/src/main/java/com/vaadin/flow/server/osgi/VaadinBundleTracker.java
@@ -259,7 +259,14 @@ private void scanClasses(Bundle bundle, Map<Long, Collection<Class<?>>> map,
 
         // get all .class resources of this bundle
         Collection<String> classes = wiring.listResources("/", "*.class",
-                BundleWiring.LISTRESOURCES_RECURSE);
+                /*
+                 * Two options: recursive to visit all resources including
+                 * sub-directories, and limit resources only to the current
+                 * wiring (bundle) avoiding possibly returned classes from
+                 * dependencies
+                 */
+                BundleWiring.LISTRESOURCES_RECURSE
+                        | BundleWiring.LISTRESOURCES_LOCAL);
 
         Collection<Class<?>> bundleClasses = new ArrayList<>();
 
@@ -271,7 +278,7 @@ private void scanClasses(Bundle bundle, Map<Long, Collection<Class<?>>> map,
                 continue;
             }
             if ("module-info".equals(className)) {
-                // New modular Java info class which we are not intrested in
+                // New modular Java info class which we are not interested in
                 continue;
             }
             try {