1 files changed, 49 insertions, 45 deletions

diff --git a/OpenSim/Data/PGSQL/PGSQLXAssetData.cs b/OpenSim/Data/PGSQL/PGSQLXAssetData.cs
index 4f682f0..1798d20 100644
--- a/OpenSim/Data/PGSQL/PGSQLXAssetData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLXAssetData.cs
@@ -141,7 +141,7 @@ namespace OpenSim.Data.PGSQL
 
                     using (NpgsqlCommand cmd = new NpgsqlCommand(
                         @"SELECT name, description, access_time, ""AssetType"", local, temporary, asset_flags, creatorid, data
-                            FROM XAssetsMeta 
+                            FROM XAssetsMeta
                             JOIN XAssetsData ON XAssetsMeta.hash = XAssetsData.Hash WHERE id=:ID",
                         dbcon))
                     {
@@ -173,16 +173,18 @@ namespace OpenSim.Data.PGSQL
 
                                     if (m_enableCompression)
                                     {
-                                        using (GZipStream decompressionStream = new GZipStream(new MemoryStream(asset.Data), CompressionMode.Decompress))
+                                        using(MemoryStream ms = new MemoryStream(asset.Data))
+                                        using(GZipStream decompressionStream = new GZipStream(ms, CompressionMode.Decompress))
                                         {
-                                            MemoryStream outputStream = new MemoryStream();
-                                            WebUtil.CopyStream(decompressionStream, outputStream, int.MaxValue);
-    //                                        int compressedLength = asset.Data.Length;
-                                            asset.Data = outputStream.ToArray();
-    
-    //                                        m_log.DebugFormat(
-    //                                            "[XASSET DB]: Decompressed {0} {1} to {2} bytes from {3}",
-    //                                            asset.ID, asset.Name, asset.Data.Length, compressedLength);
+                                            using(MemoryStream outputStream = new MemoryStream())
+                                            {
+                                                decompressionStream.CopyTo(outputStream,int.MaxValue);
+                                                //                                        int compressedLength = asset.Data.Length;
+                                                asset.Data = outputStream.ToArray();
+                                            }
+                                            //                                        m_log.DebugFormat(
+                                            //                                            "[XASSET DB]: Decompressed {0} {1} to {2} bytes from {3}",
+                                            //                                            asset.ID, asset.Name, asset.Data.Length, compressedLength);
                                         }
                                     }
 
@@ -223,16 +225,16 @@ namespace OpenSim.Data.PGSQL
                         {
                             assetName = asset.Name.Substring(0, 64);
                             m_log.WarnFormat(
-                                "[XASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                                "[XASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add",
                                 asset.Name, asset.ID, asset.Name.Length, assetName.Length);
                         }
-    
+
                         string assetDescription = asset.Description;
                         if (asset.Description.Length > 64)
                         {
                             assetDescription = asset.Description.Substring(0, 64);
                             m_log.WarnFormat(
-                                "[XASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                                "[XASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add",
                                 asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
                         }
 
@@ -268,8 +270,8 @@ namespace OpenSim.Data.PGSQL
                                         where not exists( Select id from XAssetsMeta where id = :ID);
 
                                       update XAssetsMeta
-                                          set id = :ID, hash = :Hash, name = :Name, description = :Description, 
-                                              ""AssetType"" = :AssetType, local = :Local, temporary = :Temporary, create_time = :CreateTime, 
+                                          set id = :ID, hash = :Hash, name = :Name, description = :Description,
+                                              ""AssetType"" = :AssetType, local = :Local, temporary = :Temporary, create_time = :CreateTime,
                                               access_time = :AccessTime, asset_flags = :AssetFlags, creatorid = :CreatorID
                                         where id = :ID;
                                      ",
@@ -321,13 +323,13 @@ namespace OpenSim.Data.PGSQL
                             {
                                 m_log.ErrorFormat("[XASSET DB]: PGSQL failure creating asset data {0} with name \"{1}\". Error: {2}",
                                     asset.FullID, asset.Name, e.Message);
-    
+
                                 transaction.Rollback();
-    
+
                                 return;
                             }
                         }
-    
+
                         transaction.Commit();
                     }
                 }
@@ -374,7 +376,7 @@ namespace OpenSim.Data.PGSQL
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[XASSET PGSQL DB]: Failure updating access_time for asset {0} with name {1} : {2}", 
+                            "[XASSET PGSQL DB]: Failure updating access_time for asset {0} with name {1} : {2}",
                             assetMetadata.ID, assetMetadata.Name, e.Message);
                     }
                 }
@@ -518,40 +520,42 @@ namespace OpenSim.Data.PGSQL
                 using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
                 {
                     dbcon.Open();
-                    NpgsqlCommand cmd = new NpgsqlCommand( @"SELECT name, description, access_time, ""AssetType"", temporary, id, asset_flags, creatorid
-                                            FROM XAssetsMeta 
-                                            LIMIT :start, :count", dbcon);
-                    cmd.Parameters.Add(m_database.CreateParameter("start", start));
-                    cmd.Parameters.Add(m_database.CreateParameter("count", count));
-
-                    try
+                    using(NpgsqlCommand cmd = new NpgsqlCommand(@"SELECT name, description, access_time, ""AssetType"", temporary, id, asset_flags, creatorid
+                                            FROM XAssetsMeta
+                                            LIMIT :start, :count",dbcon))
                     {
-                        using (NpgsqlDataReader dbReader = cmd.ExecuteReader())
+                        cmd.Parameters.Add(m_database.CreateParameter("start",start));
+                        cmd.Parameters.Add(m_database.CreateParameter("count", count));
+
+                        try
                         {
-                            while (dbReader.Read())
+                            using (NpgsqlDataReader dbReader = cmd.ExecuteReader())
                             {
-                                AssetMetadata metadata = new AssetMetadata();
-                                metadata.Name = (string)dbReader["name"];
-                                metadata.Description = (string)dbReader["description"];
-                                metadata.Type = Convert.ToSByte(dbReader["AssetType"]);
-                                metadata.Temporary = Convert.ToBoolean(dbReader["temporary"]);
-                                metadata.Flags = (AssetFlags)Convert.ToInt32(dbReader["asset_flags"]);
-                                metadata.FullID = DBGuid.FromDB(dbReader["id"]);
-                                metadata.CreatorID = dbReader["creatorid"].ToString();
+                                while (dbReader.Read())
+                                {
+                                    AssetMetadata metadata = new AssetMetadata();
+                                    metadata.Name = (string)dbReader["name"];
+                                    metadata.Description = (string)dbReader["description"];
+                                    metadata.Type = Convert.ToSByte(dbReader["AssetType"]);
+                                    metadata.Temporary = Convert.ToBoolean(dbReader["temporary"]);
+                                    metadata.Flags = (AssetFlags)Convert.ToInt32(dbReader["asset_flags"]);
+                                    metadata.FullID = DBGuid.FromDB(dbReader["id"]);
+                                    metadata.CreatorID = dbReader["creatorid"].ToString();
 
-                                // We'll ignore this for now - it appears unused!
-//                                metadata.SHA1 = dbReader["hash"]);
+                                    // We'll ignore this for now - it appears unused!
+    //                                metadata.SHA1 = dbReader["hash"]);
 
-                                UpdateAccessTime(metadata, (int)dbReader["access_time"]);
+                                    UpdateAccessTime(metadata, (int)dbReader["access_time"]);
 
-                                retList.Add(metadata);
+                                    retList.Add(metadata);
+                                }
                             }
                         }
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.Error("[XASSETS DB]: PGSql failure fetching asset set" + Environment.NewLine + e.ToString());
-                    }
+                        catch (Exception e)
+                        {
+                            m_log.Error("[XASSETS DB]: PGSql failure fetching asset set" + Environment.NewLine + e.ToString());
+                        }
+                   }
                 }
             }