From: Jonathan Chambers <joncham@gmail.com>
Date: Sat, 12 Jun 2010 01:07:30 +0000 (-0000)
Subject: 2010-06-11 Jonathan Chambers  <joncham@gmail.com>
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=70578b3d7444bb856c695cfe815558990c4c5a31;p=mono.git

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 33d21173b89..c34214b79f6 100644
--- 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 b7e1395e795..4ff468f30cd 100644
--- 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 2ee57bd47ad..bfbae005883 100644
--- 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 d99bf108632..9f52e366bc0 100644
--- 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;