svn commit: r1490506 - /cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java

[ffang]

Author: ffang
Date: Fri Jun  7 04:35:19 2013
New Revision: 1490506

URL: http://svn.apache.org/r1490506
Log:
[CXF-5059]add TCCL as fallback so it can load resources from other bundles in 
OSGi container

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=1490506&r1=1490505&r2=1490506&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 04:35:19 2013
@@ -275,6 +275,11 @@ public class WSDLManagerImpl implements 
         try {
             initialExtensions = 
PropertiesLoaderUtils.loadAllProperties(resource, 
                   this.getClass().getClassLoader());
+            //use TCCL as fallback so that can load resources from other 
bundles in OSGi
+            if (initialExtensions == null || initialExtensions.size() == 0) {
+                initialExtensions = 
PropertiesLoaderUtils.loadAllProperties(resource, 
+                    Thread.currentThread().getContextClassLoader());
+            }
         } catch (IOException ex) {
             throw new BusException(ex);
         }