Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AF6361068F for ; Tue, 18 Feb 2014 15:47:46 +0000 (UTC) Received: (qmail 27911 invoked by uid 500); 18 Feb 2014 15:47:44 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 27784 invoked by uid 500); 18 Feb 2014 15:47:42 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 27774 invoked by uid 99); 18 Feb 2014 15:47:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Feb 2014 15:47:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Feb 2014 15:47:38 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C19992388860; Tue, 18 Feb 2014 15:47:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1569395 - /cxf/trunk/core/src/main/java/org/apache/cxf/bus/osgi/OSGiBeanLocator.java Date: Tue, 18 Feb 2014 15:47:17 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140218154717.C19992388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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; }