[cxf] branch main updated: [CXF-8766]avoid NPE warning message by removing tryOSGI

[ffang]

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

ffang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/main by this push:
     new f8d9f35ba6 [CXF-8766]avoid NPE warning message by removing tryOSGI
f8d9f35ba6 is described below

commit f8d9f35ba6986a13fb65eadd50b701b7cbf70113
Author: Freeman Fang <freeman.f...@gmail.com>
AuthorDate: Fri Nov 25 10:30:55 2022 -0500

    [CXF-8766]avoid NPE warning message by removing tryOSGI
---
 core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java 
b/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
index e1a15e85c7..61f5d38f3f 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
@@ -152,9 +152,10 @@ public class SpringBeanLocator implements 
ConfiguredBeanLocator {
             lst.add(type.cast(context.getBean(n, type)));
         }
         lst.addAll(orig.getBeansOfType(type));
-        if (lst.isEmpty()) {
+        //TODO: [OSGi+Jakarta] Uncomment this when osgi comes back
+        /*if (lst.isEmpty()) {
             tryOSGI(lst, type);
-        }
+        }*/
         return lst;
     }
     private <T> void tryOSGI(Collection<T> lst, Class<T> type) {