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

[bharath]

Author: bharath
Date: Tue Jun 10 11:13:44 2008
New Revision: 666250

URL: http://svn.apache.org/viewvc?rev=666250&view=rev
Log:
Removed the fix made for CXF-1639. From the code it looks like we are never 
putting literal Strings as keys in maps on client or server side. So the leak 
could be because of something else. We need to profile again and see whether 
the issue is still there and if so why. Leaving the issue open till then.

Modified:
    
cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactory.java

Modified: 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactory.java?rev=666250&r1=666249&r2=666250&view=diff
==============================================================================
--- 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactory.java 
(original)
+++ 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactory.java 
Tue Jun 10 11:13:44 2008
@@ -19,8 +19,6 @@
 
 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;
@@ -42,36 +40,36 @@
 import org.apache.ws.commons.schema.XmlSchemaException;
 
 public class WSDLServiceFactory extends AbstractServiceFactoryBean {
-    
+
     private static final Logger LOG = 
LogUtils.getL7dLogger(WSDLServiceFactory.class);
-    
+
     private URL wsdlUrl;
     private QName serviceName;
     private Definition definition;
-    
+
     public WSDLServiceFactory(Bus b, Definition d) {
         setBus(b);
         definition = d;
     }
-    
+
     public WSDLServiceFactory(Bus b, Definition d, QName sn) {
         this(b, d);
         serviceName = sn;
     }
-    
+
     public WSDLServiceFactory(Bus b, URL url) {
         setBus(b);
         wsdlUrl = url;
-        
+
         try {
             // use wsdl manager to parse wsdl or get cached definition
             definition = 
getBus().getExtension(WSDLManager.class).getDefinition(wsdlUrl);
         } catch (WSDLException ex) {
             throw new ServiceConstructionException(new 
Message("SERVICE_CREATION_MSG", LOG), ex);
         }
-        
+
     }
-    
+
     public WSDLServiceFactory(Bus b, URL url, QName sn) {
         this(b, url);
         serviceName = sn;
@@ -79,25 +77,17 @@
     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
-            WSDLManager wsdlManager = getBus().getExtension(WSDLManager.class);
-            definition = wsdlManager.getDefinition(wsdlUrl);
+            definition = 
getBus().getExtension(WSDLManager.class).getDefinition(url);
         } 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;
     }
-    
+
     public Service create() {
-        
+
         List<ServiceInfo> services;
         if (serviceName == null) {
             try {
@@ -133,5 +123,5 @@
         setService(service);
         return service;
     }
-    
+
 }