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 813DB1068D for ; Fri, 7 Jun 2013 20:57:55 +0000 (UTC) Received: (qmail 45795 invoked by uid 500); 7 Jun 2013 20:57:55 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 45749 invoked by uid 500); 7 Jun 2013 20:57:55 -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 45742 invoked by uid 99); 7 Jun 2013 20:57:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Jun 2013 20:57:55 +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; Fri, 07 Jun 2013 20:57:53 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E5E7D2388906; Fri, 7 Jun 2013 20:57:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1490823 - /cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java Date: Fri, 07 Jun 2013 20:57:32 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130607205732.E5E7D2388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Fri Jun 7 20:57:31 2013 New Revision: 1490823 URL: http://svn.apache.org/r1490823 Log: Merged revisions 1490818 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ........ r1490818 | dkulp | 2013-06-07 16:52:35 -0400 (Fri, 07 Jun 2013) | 10 lines Merged revisions 1490672 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1490672 | dkulp | 2013-06-07 11:02:02 -0400 (Fri, 07 Jun 2013) | 2 lines [CXF-5059] The bus is garanteed to be null during registerInitialXmlExtensions so pass the bus into it. ........ ........ Modified: cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java Modified: cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java?rev=1490823&r1=1490822&r2=1490823&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java (original) +++ cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java Fri Jun 7 20:57:31 2013 @@ -90,6 +90,9 @@ public class WSDLManagerImpl implements private Bus bus; public WSDLManagerImpl() throws BusException { + this(null); + } + private WSDLManagerImpl(Bus b) throws BusException { try { factory = WSDLFactory.newInstance(); registry = factory.newPopulatedExtensionRegistry(); @@ -117,10 +120,7 @@ public class WSDLManagerImpl implements definitionsMap = new CacheMap(); schemaCacheMap = new CacheMap(); - registerInitialExtensions(); - } - public WSDLManagerImpl(Bus b) throws BusException { - this(); + registerInitialExtensions(b); setBus(b); } @@ -253,16 +253,16 @@ public class WSDLManagerImpl implements return def; } - private void registerInitialExtensions() throws BusException { - registerInitialXmlExtensions(EXTENSIONS_RESOURCE_COMPAT); - registerInitialXmlExtensions(EXTENSIONS_RESOURCE); + private void registerInitialExtensions(Bus b) throws BusException { + registerInitialXmlExtensions(EXTENSIONS_RESOURCE_COMPAT, b); + registerInitialXmlExtensions(EXTENSIONS_RESOURCE, b); } - private void registerInitialXmlExtensions(String resource) throws BusException { + private void registerInitialXmlExtensions(String resource, Bus b) throws BusException { Properties initialExtensions = null; try { ClassLoader cl = null; - if (bus != null) { - cl = bus.getExtension(ClassLoader.class); + if (b != null) { + cl = b.getExtension(ClassLoader.class); } if (cl != null) { initialExtensions = PropertiesLoaderUtils.loadAllProperties(resource, cl);