Imported Upstream version 3.10.0

Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b

mcs/class/System.ServiceModel/System.ServiceModel/AllEnums.cs

@@ -411,6 +411,8 @@ namespace System.ServiceModel.Security
 		Custom,
 	}
 
+#if !NET_4_5
+
 	public enum X509CertificateValidationMode
 	{
 		None,
@@ -419,6 +421,7 @@ namespace System.ServiceModel.Security
 		PeerOrChainTrust,
 		Custom,
 	}
+#endif
 }
 
 namespace System.ServiceModel.Security.Tokens

mcs/class/System.ServiceModel/System.ServiceModel/ClientRuntimeChannel.cs

@@ -449,21 +449,27 @@ namespace System.ServiceModel.MonoInternal
 				throw new InvalidOperationException ("another operation is in progress");
 			context = OperationContext.Current;
 
-			return _processDelegate.BeginInvoke (method, operationName, parameters, callback, asyncState);
+			try {
+				return _processDelegate.BeginInvoke (method, operationName, parameters, callback, asyncState);
+			} catch {
+				context = null;
+				throw;
+			}
 		}
 
 		public object EndProcess (MethodBase method, string operationName, object [] parameters, IAsyncResult result)
 		{
-				
-			if (result == null)
-				throw new ArgumentNullException ("result");
-			if (parameters == null)
-				throw new ArgumentNullException ("parameters");
-			// FIXME: the method arguments should be verified to be 
-			// identical to the arguments in the corresponding begin method.
-			object asyncResult = _processDelegate.EndInvoke (result);
-			context = null;
-			return asyncResult;
+			try {
+				if (result == null)
+					throw new ArgumentNullException ("result");
+				if (parameters == null)
+					throw new ArgumentNullException ("parameters");
+				// FIXME: the method arguments should be verified to be 
+				// identical to the arguments in the corresponding begin method.
+				return _processDelegate.EndInvoke (result);
+			} finally {
+				context = null;
+			}
 		}
 
 		public object Process (MethodBase method, string operationName, object [] parameters)