cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1490510 - in /cxf/branches/2.6.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
Date Fri, 07 Jun 2013 04:49:53 GMT
Author: ffang
Date: Fri Jun  7 04:49:52 2013
New Revision: 1490510

URL: http://svn.apache.org/r1490510
Log:
Merged revisions 1490509 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

................
  r1490509 | ffang | 2013-06-07 12:45:13 +0800 (五, 07  6 2013) | 9 lines
  
  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.6.x-fixes/   (props changed)
    cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun  7 04:49:52 2013
@@ -0,0 +1,2 @@
+/cxf/branches/2.7.x-fixes:1490509
+/cxf/trunk:1490506

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

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=1490510&r1=1490509&r2=1490510&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 04:49:52 2013
@@ -262,6 +262,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);
         }



Mime
View raw message