You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2014/02/18 16:47:17 UTC
svn commit: r1569395 -
/cxf/trunk/core/src/main/java/org/apache/cxf/bus/osgi/OSGiBeanLocator.java
Author: sergeyb
Date: Tue Feb 18 15:47:17 2014
New Revision: 1569395
URL: http://svn.apache.org/r1569395
Log:
[CXF-5568] Restricting the check only if ClassLoader is requested
Modified:
cxf/trunk/core/src/main/java/org/apache/cxf/bus/osgi/OSGiBeanLocator.java
Modified: cxf/trunk/core/src/main/java/org/apache/cxf/bus/osgi/OSGiBeanLocator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/core/src/main/java/org/apache/cxf/bus/osgi/OSGiBeanLocator.java?rev=1569395&r1=1569394&r2=1569395&view=diff
==============================================================================
--- cxf/trunk/core/src/main/java/org/apache/cxf/bus/osgi/OSGiBeanLocator.java (original)
+++ cxf/trunk/core/src/main/java/org/apache/cxf/bus/osgi/OSGiBeanLocator.java Tue Feb 18 15:47:17 2014
@@ -64,7 +64,8 @@ public class OSGiBeanLocator implements
ServiceReference refs[] = context.getServiceReferences(type.getName(), null);
if (refs != null) {
for (ServiceReference r : refs) {
- if (checkCompatibleLocators
+ if (type == ClassLoader.class
+ && checkCompatibleLocators
&& !PropertyUtils.isTrue(r.getProperty(COMPATIBLE_LOCATOR_PROP))) {
continue;
}