svn commit: r1490509 - in /cxf/branches/2.7.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java

[ffang]

Author: ffang
Date: Fri Jun  7 04:45:13 2013
New Revision: 1490509

URL: http://svn.apache.org/r1490509
Log:
Merged revisions 1490506 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1490506 | ffang | 2013-06-07 12:35:19 +0800 (五, 07  6 2013) | 1 line
  
  [CXF-5059]add TCCL as fallback so it can load resources from other bundles in 
OSGi container
........

Modified:
    cxf/branches/2.7.x-fixes/   (props changed)
    
cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:1490506

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java?rev=1490509&r1=1490508&r2=1490509&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
 Fri Jun  7 04:45:13 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);
         }