Merge pull request #4621 from alexanderkyte/strdup_env

[mono.git] / mcs / class / System.Transactions / System.Transactions / CommittableTransaction.cs

diff --git a/mcs/class/System.Transactions/System.Transactions/CommittableTransaction.cs b/mcs/class/System.Transactions/System.Transactions/CommittableTransaction.cs
index d171ee598fec1e673b6a70ad920f200014e7e14e..f98f6fa6e129338cf2482e497d981ef24cc0b0db 100644 (file)
--- a/mcs/class/System.Transactions/System.Transactions/CommittableTransaction.cs
+++ b/mcs/class/System.Transactions/System.Transactions/CommittableTransaction.cs
@@ -9,7 +9,6 @@
 // (C)2006 Novell Inc,
 //
 
-#if NET_2_0
 using System.Runtime.Serialization;
 using System.Threading;
 
@@ -42,26 +41,26 @@ namespace System.Transactions
                        this.options = options;
                }
 
-               public IAsyncResult BeginCommit (AsyncCallback callback,
-                       object user_defined_state)
+               public IAsyncResult BeginCommit (AsyncCallback asyncCallback,
+                       object asyncState)
                {
-                       this.callback = callback;
-                       this.user_defined_state = user_defined_state;
+                       this.callback = asyncCallback;
+                       this.user_defined_state = asyncState;
 
                        AsyncCallback cb = null;
-                       if (callback != null)
+                       if (asyncCallback != null)
                                cb = new AsyncCallback (CommitCallback);
 
                        asyncResult = BeginCommitInternal (cb);
                        return this;
                }
                
-               public void EndCommit (IAsyncResult ar)
+               public void EndCommit (IAsyncResult asyncResult)
                {
-                       if (ar != this)
+                       if (asyncResult != this)
                                throw new ArgumentException ("The IAsyncResult parameter must be the same parameter as returned by BeginCommit.", "asyncResult");
 
-                       EndCommitInternal (asyncResult);
+                       EndCommitInternal (this.asyncResult);
                }
 
                private void CommitCallback (IAsyncResult ar)
@@ -103,4 +102,3 @@ namespace System.Transactions
        }
 }
 
-#endif