* Stop asset transactions hanging around after they've completed

* Still not enough to solve the memory leak, though hopefully this is another step on the path
* All these changes are pretty temporary - this will be addressed with a more fundamental refactor in the future

1 files changed, 18 insertions, 2 deletions

diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs b/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs
index c9c9541..b458b18 100644
--- a/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs
@@ -25,13 +25,19 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
+
+using System;
 using System.Collections.Generic;
+
 using libsecondlife;
 
 namespace OpenSim.Framework.Communications.Cache
 {
     public class AssetTransactionManager
     {
+        private static readonly log4net.ILog m_log 
+            = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        
         // Fields
         public CommunicationsManager CommsManager;
 
@@ -92,7 +98,17 @@ namespace OpenSim.Framework.Communications.Cache
                 AgentAssetTransactions.AssetXferUploader uploader = transactions.RequestXferUploader(transaction);
                 if (uploader != null)
                 {
-                    uploader.Initialise(remoteClient, assetID, transaction, type, data, storeLocal, tempFile);
+                    // Upload has already compelted uploading...
+                    if (uploader.Initialise(remoteClient, assetID, transaction, type, data, storeLocal, tempFile))
+                    {
+                        lock (transactions.XferUploaders)
+                        {
+                            // XXX Weak ass way of doing this by directly manipulating this public dictionary, purely temporary
+                            transactions.XferUploaders.Remove(uploader.TransactionID);
+                            
+                            m_log.Info(String.Format("[ASSET TRANSACTIONS] Current uploaders: {0}", transactions.XferUploaders.Count));                        
+                        }
+                    }
                 }
             }
         }
@@ -106,4 +122,4 @@ namespace OpenSim.Framework.Communications.Cache
             }
         }
     }
-}
\ No newline at end of file
+}