cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject git commit: [CXF-5568] Restricting the check only if ClassLoader is requested
Date Wed, 19 Feb 2014 16:54:46 GMT
Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 449abe830 -> 4bf1ec021


[CXF-5568] Restricting the check only if ClassLoader is requested

git-svn-id: https://svn.apache.org/repos/asf/cxf/trunk@1569395 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4bf1ec02
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4bf1ec02
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4bf1ec02

Branch: refs/heads/2.7.x-fixes
Commit: 4bf1ec021bdae5d3df9acf3e7241750569e060e4
Parents: 449abe8
Author: Sergey Beryozkin <sergeyb@apache.org>
Authored: Tue Feb 18 15:47:17 2014 +0000
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Wed Feb 19 16:54:29 2014 +0000

----------------------------------------------------------------------
 .../src/main/java/org/apache/cxf/bus/osgi/OSGiBeanLocator.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/4bf1ec02/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGiBeanLocator.java
----------------------------------------------------------------------
diff --git a/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGiBeanLocator.java b/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGiBeanLocator.java
index 61631cc..7d621a2 100644
--- a/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGiBeanLocator.java
+++ b/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGiBeanLocator.java
@@ -64,7 +64,8 @@ public class OSGiBeanLocator implements ConfiguredBeanLocator {
             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;
                     }


Mime
View raw message