2008-04-15 Marek Habersack <mhabersack@novell.com>

        * AssemblyResourceLoader.cs: dispose of streams the way it should
        be done.

2008-04-15  Marek Habersack  <mhabersack@novell.com>

        * MailDefinition.cs: dispose of streams the way it should
        be done.

2008-04-15  Marek Habersack  <mhabersack@novell.com>

        * HttpRequest.cs: dispose of streams the way it should
        be done.

2008-04-15  Marek Habersack  <mhabersack@novell.com>

        * CachingCompiler.cs: dispose of streams the way it should
        be done.

svn path=/trunk/mcs/; revision=100690

diff --git a/mcs/class/System.Web/System.Web.Compilation/CachingCompiler.cs b/mcs/class/System.Web/System.Web.Compilation/CachingCompiler.cs
index eb5e35b77aab8e2cede1807c56b9fd4e26f5314f..c3094b2feaa6ed868979733c6b2d4917c02912a3 100644 (file)
--- a/mcs/class/System.Web/System.Web.Compilation/CachingCompiler.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/CachingCompiler.cs
@@ -242,14 +242,16 @@ namespace System.Web.Compilation
                {
                        CompilerResults result = CachingCompiler.Compile (language, key, file, assemblies);
                        if (result.NativeCompilerReturnValue != 0) {
-                               StreamReader reader = new StreamReader (file);
-                               throw new CompilationException (file, result.Errors, reader.ReadToEnd ());
+                               using (StreamReader reader = new StreamReader (file)) {
+                                       throw new CompilationException (file, result.Errors, reader.ReadToEnd ());
+                               }
                        }
 
                        Assembly assembly = result.CompiledAssembly;
                        if (assembly == null) {
-                               StreamReader reader = new StreamReader (file);
-                               throw new CompilationException (file, result.Errors, reader.ReadToEnd ());
+                               using (StreamReader reader = new StreamReader (file)) {
+                                       throw new CompilationException (file, result.Errors, reader.ReadToEnd ());
+                               }
                        }
                
                        Type type = assembly.GetType (typename, true);

diff --git a/mcs/class/System.Web/System.Web.Compilation/ChangeLog b/mcs/class/System.Web/System.Web.Compilation/ChangeLog
index 9a166f14245b577ba92ff05c467aa7889ab12a27..2103c802892afa375bbaf26e7a986844c3b78d54 100644 (file)
--- a/mcs/class/System.Web/System.Web.Compilation/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Compilation/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-15  Marek Habersack  <mhabersack@novell.com>
+
+       * CachingCompiler.cs: dispose of streams the way it should
+       be done.
+
 2008-04-09  Marek Habersack  <mhabersack@novell.com>
 
        * BuildManager.cs: refactoring - the SetCommonParameters and

diff --git a/mcs/class/System.Web/System.Web.Handlers/AssemblyResourceLoader.cs b/mcs/class/System.Web/System.Web.Handlers/AssemblyResourceLoader.cs
index 7881213e5d00c9a0d395fa5a1f56a39937e2506b..94caf82c3e35fd162f5c4b28a93e36b0aa7ba7db 100644 (file)
--- a/mcs/class/System.Web/System.Web.Handlers/AssemblyResourceLoader.cs
+++ b/mcs/class/System.Web/System.Web.Handlers/AssemblyResourceLoader.cs
@@ -260,9 +260,10 @@ namespace System.Web.Handlers {
                                throw new HttpException (404, String.Concat ("Resource ", resourceName, " not found"));
 
                        if (wra.PerformSubstitution) {
-                               StreamReader r = new StreamReader (s);
-                               TextWriter w = context.Response.Output;
-                               new PerformSubstitutionHelper (assembly).PerformSubstitution (r, w);
+                               using (StreamReader r = new StreamReader (s)) {
+                                       TextWriter w = context.Response.Output;
+                                       new PerformSubstitutionHelper (assembly).PerformSubstitution (r, w);
+                               }
                        }
                        else {
                                byte [] buf = new byte [1024];

diff --git a/mcs/class/System.Web/System.Web.Handlers/ChangeLog b/mcs/class/System.Web/System.Web.Handlers/ChangeLog
index f39783efc06b9aa0667eb979440479762414af48..71173500d5739bdc69e9ae2ea5e694c7a8809275 100644 (file)
--- a/mcs/class/System.Web/System.Web.Handlers/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Handlers/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-15  Marek Habersack  <mhabersack@novell.com>
+
+       * AssemblyResourceLoader.cs: dispose of streams the way it should
+       be done.
+
 2007-12-13  Marek Habersack  <mhabersack@novell.com>
 
        * AssemblyResourceLoader.cs: speed optimization - use String.Concat

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
index 840c15c6ddacf0616e44ac95e28ff144feebf16f..f74e467aab0cb60d95ff35b4e7e01754e4a6e49b 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-15  Marek Habersack  <mhabersack@novell.com>
+
+       * MailDefinition.cs: dispose of streams the way it should
+       be done.
+
 2008-04-10  Marek Habersack  <mhabersack@novell.com>
        
        * RadioButton.cs: adjust 'name' and 'value' attribute values to

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/MailDefinition.cs b/mcs/class/System.Web/System.Web.UI.WebControls/MailDefinition.cs
index 82d4fd2a71bd5d429cf81fe264e8578f92c812f8..c3b39b2deafde96fea5cf92198c8b1ca7964e331 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/MailDefinition.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/MailDefinition.cs
@@ -108,9 +108,9 @@ namespace System.Web.UI.WebControls
                                else
                                        filePath = Path.Combine (owner.TemplateSourceDirectory, BodyFileName);
 
-                               StreamReader sr = new StreamReader (filePath);
-                               bodyText = sr.ReadToEnd ();
-                               sr.Close ();
+                               using (StreamReader sr = new StreamReader (filePath)) {
+                                       bodyText = sr.ReadToEnd ();
+                               }
                        }
                        else
                                bodyText = "";

diff --git a/mcs/class/System.Web/System.Web/ChangeLog b/mcs/class/System.Web/System.Web/ChangeLog
index c431dc951a5ea17f039a6d7ff923e820ad080bcc..c6db5267e22fd0a47be9100e040312a61c4529dd 100644 (file)
--- a/mcs/class/System.Web/System.Web/ChangeLog
+++ b/mcs/class/System.Web/System.Web/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-15  Marek Habersack  <mhabersack@novell.com>
+
+       * HttpRequest.cs: dispose of streams the way it should
+       be done.
+
 2008-04-14  Igor Zelmanovich <igorz@mainsoft.com>
 
        * HttpRuntime.cs: refactoring.

diff --git a/mcs/class/System.Web/System.Web/HttpRequest.cs b/mcs/class/System.Web/System.Web/HttpRequest.cs
index f9c0563c030d15903403ed22cf9de18cde9435e6..e9de4df7b36722614a514c5adc1162f296fde303 100644 (file)
--- a/mcs/class/System.Web/System.Web/HttpRequest.cs
+++ b/mcs/class/System.Web/System.Web/HttpRequest.cs
@@ -568,36 +568,37 @@ namespace System.Web {
                void LoadWwwForm ()
 #endif
                {
-                       Stream input = GetSubStream (InputStream);
-                       StreamReader s = new StreamReader (input, ContentEncoding);
-
-                       StringBuilder key = new StringBuilder ();
-                       StringBuilder value = new StringBuilder ();
-                       int c;
+                       using (Stream input = GetSubStream (InputStream)) {
+                               using (StreamReader s = new StreamReader (input, ContentEncoding)) {
+                                       StringBuilder key = new StringBuilder ();
+                                       StringBuilder value = new StringBuilder ();
+                                       int c;
 
-                       while ((c = s.Read ()) != -1){
-                               if (c == '='){
-                                       value.Length = 0;
                                        while ((c = s.Read ()) != -1){
-                                               if (c == '&'){
+                                               if (c == '='){
+                                                       value.Length = 0;
+                                                       while ((c = s.Read ()) != -1){
+                                                               if (c == '&'){
+                                                                       AddRawKeyValue (key, value);
+                                                                       break;
+                                                               } else
+                                                                       value.Append ((char) c);
+                                                       }
+                                                       if (c == -1){
+                                                               AddRawKeyValue (key, value);
+                                                               return;
+                                                       }
+                                               } else if (c == '&')
                                                        AddRawKeyValue (key, value);
-                                                       break;
-                                               } else
-                                                       value.Append ((char) c);
+                                               else
+                                                       key.Append ((char) c);
                                        }
-                                       if (c == -1){
+                                       if (c == -1)
                                                AddRawKeyValue (key, value);
-                                               return;
-                                       }
-                               } else if (c == '&')
-                                       AddRawKeyValue (key, value);
-                               else
-                                       key.Append ((char) c);
-                       }
-                       if (c == -1)
-                               AddRawKeyValue (key, value);
 
-                       EndSubStream (input);
+                                       EndSubStream (input);
+                               }
+                       }
                }
 
                bool IsContentType (string ct, bool starts_with)