Author: dkulp Date: Wed Jun 11 08:35:59 2008 New Revision: 666709 URL: http://svn.apache.org/viewvc?rev=666709&view=rev Log: Merged revisions 666085 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk
........ r666085 | bharath | 2008-06-10 08:27:07 -0400 (Tue, 10 Jun 2008) | 2 lines [CXF-1639] Fix for several memory leak issues. http://www.nabble.com/Memory-Leak-at-WSDLManagerImpl-td17579537.html ........ Modified: cxf/branches/2.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactory.java Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactory.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactory.java?rev=666709&r1=666708&r2=666709&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactory.java (original) +++ cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactory.java Wed Jun 11 08:35:59 2008 @@ -19,6 +19,8 @@ package org.apache.cxf.wsdl11; +import java.io.File; +import java.net.MalformedURLException; import java.net.URL; import java.util.Iterator; import java.util.List; @@ -77,10 +79,18 @@ public WSDLServiceFactory(Bus b, String url, QName sn) { setBus(b); try { + try { + wsdlUrl = new URL(url); + } catch (MalformedURLException e) { + wsdlUrl = new File(url).toURL(); + } // use wsdl manager to parse wsdl or get cached definition - definition = getBus().getExtension(WSDLManager.class).getDefinition(url); + WSDLManager wsdlManager = getBus().getExtension(WSDLManager.class); + definition = wsdlManager.getDefinition(wsdlUrl); } catch (WSDLException ex) { throw new ServiceConstructionException(new Message("SERVICE_CREATION_MSG", LOG), ex); + } catch (MalformedURLException ex) { + throw new ServiceConstructionException(new Message("SERVICE_CREATION_MSG", LOG), ex); } serviceName = sn;
