2010-06-11 Jonathan Chambers <joncham@gmail.com>

	* X509Certificate2Collection.cs: Add {} around default switch case.
	* HttpListenerRequest.cs: Assign default value to variable before using.

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

diff --git a/mcs/class/System/System.Net/ChangeLog b/mcs/class/System/System.Net/ChangeLog
index 33d21173b892c0d13f6443403a16948422ea076e..c34214b79f6f5348958b0ef426162aeba7e45487 100644 (file)
--- a/mcs/class/System/System.Net/ChangeLog
+++ b/mcs/class/System/System.Net/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-11 Jonathan Chambers  <joncham@gmail.com>
+
+       * HttpListenerRequest.cs: Assign default value to variable before using.
+
 2010-05-18 Gonzalo Paniagua Javier <gonzalo@novell.com>
 
        * FtpDataStream.cs:

diff --git a/mcs/class/System/System.Net/HttpListenerRequest.cs b/mcs/class/System/System.Net/HttpListenerRequest.cs
index b7e1395e79510c1ab8db2484cde80b21179ac10a..4ff468f30cdf2874566382bd713ef2dc6a0d6c1b 100644 (file)
--- a/mcs/class/System/System.Net/HttpListenerRequest.cs
+++ b/mcs/class/System/System.Net/HttpListenerRequest.cs
@@ -140,7 +140,7 @@ namespace System.Net {
                        }
 
                        string path;
-                       Uri raw_uri;
+                       Uri raw_uri = null;
                        if (Uri.MaybeUri (raw_url) && Uri.TryCreate (raw_url, UriKind.Absolute, out raw_uri))
                                path = raw_uri.PathAndQuery;
                        else

diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/ChangeLog b/mcs/class/System/System.Security.Cryptography.X509Certificates/ChangeLog
index 2ee57bd47ade0d440ca8d98b8e58cb5d083579b6..bfbae0058835217d05385d2ce698e5494db9ad44 100644 (file)
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/ChangeLog
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-11 Jonathan Chambers  <joncham@gmail.com>
+
+       * X509Certificate2Collection.cs: Add {} around default switch case.
+
 2010-05-10  Sebastien Pouliot  <sebastien@ximian.com>
 
        * PublicKey.cs

diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2Collection.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2Collection.cs
index d99bf108632d17552f1e451e22be880dd0025486..9f52e366bc0c6a9f0d9b770a6c3ce90184eece3f 100644 (file)
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2Collection.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2Collection.cs
@@ -220,8 +220,10 @@ namespace System.Security.Cryptography.X509Certificates {
                                }
                                break;
                        default:
-                               string msg = Locale.GetText ("Invalid find type '{0}'.", findType);
-                               throw new CryptographicException (msg);
+                               {
+                                       string msg = Locale.GetText ("Invalid find type '{0}'.", findType);
+                                       throw new CryptographicException (msg);
+                               }
                        }
 
                        CultureInfo cinv = CultureInfo.InvariantCulture;