Imported Upstream version 2.0.0.11353upstream/2.0.0.11353

1 files changed, 24 insertions, 20 deletions

diff --git a/src/mscorlib/src/System/OperationCanceledException.cs b/src/mscorlib/src/System/OperationCanceledException.cs
index 061201637a..826561776f 100644
--- a/src/mscorlib/src/System/OperationCanceledException.cs
+++ b/src/mscorlib/src/System/OperationCanceledException.cs
@@ -15,43 +15,46 @@ using System;
 using System.Runtime.Serialization;
 using System.Threading;
 
-namespace System {
-
+namespace System
+{
     [Serializable]
     public class OperationCanceledException : SystemException
     {
-        [NonSerialized] 
+        [NonSerialized]
         private CancellationToken _cancellationToken;
-        
+
         public CancellationToken CancellationToken
         {
-            get { return _cancellationToken;}
-            private set { _cancellationToken = value;}
+            get { return _cancellationToken; }
+            private set { _cancellationToken = value; }
         }
 
-        public OperationCanceledException() 
-            : base(Environment.GetResourceString("OperationCanceled")) {
-            SetErrorCode(__HResults.COR_E_OPERATIONCANCELED);
+        public OperationCanceledException()
+            : base(SR.OperationCanceled)
+        {
+            HResult = __HResults.COR_E_OPERATIONCANCELED;
         }
-        
-        public OperationCanceledException(String message) 
-            : base(message) {
-            SetErrorCode(__HResults.COR_E_OPERATIONCANCELED);
+
+        public OperationCanceledException(String message)
+            : base(message)
+        {
+            HResult = __HResults.COR_E_OPERATIONCANCELED;
         }
-    
-        public OperationCanceledException(String message, Exception innerException) 
-            : base(message, innerException) {
-            SetErrorCode(__HResults.COR_E_OPERATIONCANCELED);
+
+        public OperationCanceledException(String message, Exception innerException)
+            : base(message, innerException)
+        {
+            HResult = __HResults.COR_E_OPERATIONCANCELED;
         }
 
 
         public OperationCanceledException(CancellationToken token)
-            :this()
+            : this()
         {
             CancellationToken = token;
         }
 
-        public OperationCanceledException(String message, CancellationToken token) 
+        public OperationCanceledException(String message, CancellationToken token)
             : this(message)
         {
             CancellationToken = token;
@@ -63,7 +66,8 @@ namespace System {
             CancellationToken = token;
         }
 
-        protected OperationCanceledException(SerializationInfo info, StreamingContext context) : base (info, context) {
+        protected OperationCanceledException(SerializationInfo info, StreamingContext context) : base(info, context)
+        {
         }
     }
 }