Author: ffang
Date: Fri Jun 7 07:26:30 2013
New Revision: 1490526
URL: http://svn.apache.org/r1490526
Log:
[CXF-5059]use bus.getExtension(ClassLoader.class) as default CL
Modified:
cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
Modified:
cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java?rev=1490526&r1=1490525&r2=1490526&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
(original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
Fri Jun 7 07:26:30 2013
@@ -273,8 +273,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,
