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 8A20A8EBD for ; Tue, 13 Sep 2011 17:24:07 +0000 (UTC) Received: (qmail 16245 invoked by uid 500); 13 Sep 2011 17:24:07 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 16182 invoked by uid 500); 13 Sep 2011 17:24:07 -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 16175 invoked by uid 99); 13 Sep 2011 17:24:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Sep 2011 17:24:07 +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, 13 Sep 2011 17:24:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 43AEC2388994 for ; Tue, 13 Sep 2011 17:23:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1170254 - in /cxf/branches/2.4.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGiExtensionLocator.java Date: Tue, 13 Sep 2011 17:23:46 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110913172346.43AEC2388994@eris.apache.org> Author: dkulp Date: Tue Sep 13 17:23:45 2011 New Revision: 1170254 URL: http://svn.apache.org/viewvc?rev=1170254&view=rev Log: Merged revisions 1170253 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1170253 | dkulp | 2011-09-13 13:22:09 -0400 (Tue, 13 Sep 2011) | 2 lines Make sure the proper classloader is used to load the osgi based bus extensions. ........ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGiExtensionLocator.java Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGiExtensionLocator.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGiExtensionLocator.java?rev=1170254&r1=1170253&r2=1170254&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGiExtensionLocator.java (original) +++ cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/osgi/OSGiExtensionLocator.java Tue Sep 13 17:23:45 2011 @@ -199,7 +199,12 @@ public class OSGiExtensionLocator implem } return super.loadInterface(cl); } - + public Extension cloneNoObject() { + OSGiExtension ext = new OSGiExtension(this, bundle); + ext.obj = null; + return ext; + } + } }