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

[bharath]

Author: bharath
Date: Tue Jun 10 05:18:56 2008
New Revision: 666084

URL: http://svn.apache.org/viewvc?rev=666084&view=rev
Log:
[CXF-1621] Fix for several memory leak issues. 
http://www.nabble.com/Memory-Leak-at-WSDLManagerImpl-td17579537.html

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=666084&r1=666083&r2=666084&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 
Tue Jun 10 05:18:56 2008
@@ -20,6 +20,7 @@
 package org.apache.cxf.wsdl11;
 
 import java.io.IOException;
+import java.lang.ref.WeakReference;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -74,7 +75,17 @@
     final ExtensionRegistry registry;
     final WSDLFactory factory;
     final Map<Object, Definition> definitionsMap;
-    final Map<Definition, ServiceSchemaInfo> schemaCacheMap; 
+    
+    /**
+     * The schemaCacheMap is used as a cache of SchemaInfo against the 
WSDLDefinitions.
+     * Note that the value is a WeakReference of ServiceSchemaInfo - Here the 
ServiceSchemaInfo in turn holds
+     * the key WSDL Definition. Since the value always strongly refers to the 
key, we make the value also
+     * weak - so that whenever their is no external strong reference to the 
key, the entry will qualify for
+     * removal from the map.
+     * https://issues.apache.org/jira/browse/CXF-1621
+     *
+     */
+    final Map<Definition, WeakReference<ServiceSchemaInfo>> schemaCacheMap;
     private boolean disableSchemaCache;
     
     private Bus bus;
@@ -99,7 +110,7 @@
             throw new BusException(e);
         }
         definitionsMap = new CacheMap<Object, Definition>();
-        schemaCacheMap = new CacheMap<Definition, ServiceSchemaInfo>();
+        schemaCacheMap = new CacheMap<Definition, 
WeakReference<ServiceSchemaInfo>>();
 
         registerInitialExtensions();
     }
@@ -203,11 +214,7 @@
         ResourceManagerWSDLLocator wsdlLocator = new 
ResourceManagerWSDLLocator(url,
                                                                                
 catLocator,
                                                                                
 bus);
-        Definition def = reader.readWSDL(wsdlLocator);
-        synchronized (definitionsMap) {
-            definitionsMap.put(url, def);
-        }
-        return def;
+        return reader.readWSDL(wsdlLocator);
     }
 
     private void registerInitialExtensions() throws BusException {
@@ -244,15 +251,18 @@
             return null;
         }
         synchronized (schemaCacheMap) {
-            return schemaCacheMap.get(wsdl);
+            WeakReference<ServiceSchemaInfo> weakReference = 
schemaCacheMap.get(wsdl);
+            if (weakReference != null) {
+                return weakReference.get();
+            }
         }
-        
+        return null;
     }
 
     public void putSchemasForDefinition(Definition wsdl, ServiceSchemaInfo 
schemas) {
         if (!disableSchemaCache) {
             synchronized (schemaCacheMap) {
-                schemaCacheMap.put(wsdl, schemas);
+                schemaCacheMap.put(wsdl, new 
WeakReference<ServiceSchemaInfo>(schemas));
             }
         }