diff options
| author | Melanie Thielker | 2008-08-31 10:42:35 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-08-31 10:42:35 +0000 |
| commit | 805deb5a9ba51307393dc5e11b100c86ee7c1b79 (patch) | |
| tree | 3ea5d5aa6f720a8112e3c55d912291d18e13b084 /OpenSim/Framework/Communications/Cache/GridAssetClient.cs | |
| parent | * Pragma out deprecation warning and comment out to remove other warnings in ... (diff) | |
| download | opensim-SC_OLD-805deb5a9ba51307393dc5e11b100c86ee7c1b79.zip opensim-SC_OLD-805deb5a9ba51307393dc5e11b100c86ee7c1b79.tar.gz opensim-SC_OLD-805deb5a9ba51307393dc5e11b100c86ee7c1b79.tar.bz2 opensim-SC_OLD-805deb5a9ba51307393dc5e11b100c86ee7c1b79.tar.xz | |
Attempt to fix an issue I havebeen seeing, where asset server failure
results in a memory leak which will make the region crash and burn
after a while.
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/GridAssetClient.cs')
| -rw-r--r-- | OpenSim/Framework/Communications/Cache/GridAssetClient.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs index 9cccf66..1c947dc 100644 --- a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs +++ b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs | |||
| @@ -63,6 +63,9 @@ namespace OpenSim.Framework.Communications.Cache | |||
| 63 | 63 | ||
| 64 | Stream s = rc.Request(); | 64 | Stream s = rc.Request(); |
| 65 | 65 | ||
| 66 | if (s == null) | ||
| 67 | return null; | ||
| 68 | |||
| 66 | if (s.Length > 0) | 69 | if (s.Length > 0) |
| 67 | { | 70 | { |
| 68 | XmlSerializer xs = new XmlSerializer(typeof (AssetBase)); | 71 | XmlSerializer xs = new XmlSerializer(typeof (AssetBase)); |