Author: ffang Date: Fri Jun 7 08:13:03 2013 New Revision: 1490532 URL: http://svn.apache.org/r1490532 Log: Merged revisions 1490530 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
................ r1490530 | ffang | 2013-06-07 16:06:20 +0800 (五, 07 6 2013) | 16 lines Merged revisions 1490529 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ................ r1490529 | ffang | 2013-06-07 16:02:10 +0800 (五, 07 6 2013) | 9 lines Merged revisions 1490526 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1490526 | ffang | 2013-06-07 15:26:30 +0800 (五, 07 6 2013) | 1 line [CXF-5059]use bus.getExtension(ClassLoader.class) as default CL ........ ................ ................ Modified: cxf/branches/2.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/branches/2.7.x-fixes:r1490529 Merged /cxf/trunk:r1490526 Merged /cxf/branches/2.6.x-fixes:r1490530 Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java?rev=1490532&r1=1490531&r2=1490532&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java (original) +++ cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java Fri Jun 7 08:13:03 2013 @@ -262,8 +262,14 @@ public class WSDLManagerImpl implements private void registerInitialXmlExtensions(String resource) throws BusException { Properties initialExtensions = null; try { - initialExtensions = PropertiesLoaderUtils.loadAllProperties(resource, - this.getClass().getClassLoader()); + ClassLoader cl = null; + if (bus != null) { + cl = bus.getExtension(ClassLoader.class); + } + if (cl != null) { + initialExtensions = PropertiesLoaderUtils.loadAllProperties(resource, cl); + } + //use TCCL as fallback so that can load resources from other bundles in OSGi if (initialExtensions == null || initialExtensions.size() == 0) { initialExtensions = PropertiesLoaderUtils.loadAllProperties(resource,
