Merge pull request #4453 from lambdageek/bug-49721

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

diff --git a/mcs/class/System.Transactions/System.Transactions/PreparingEnlistment.cs b/mcs/class/System.Transactions/System.Transactions/PreparingEnlistment.cs
index 8995fcb851a74f188ecd67b0d03a6915ad8589f0..e662279f85b5c65a21e2728dd10d3b66e6855990 100644 (file)
--- a/mcs/class/System.Transactions/System.Transactions/PreparingEnlistment.cs
+++ b/mcs/class/System.Transactions/System.Transactions/PreparingEnlistment.cs
@@ -9,7 +9,6 @@
 // (C)2006 Novell Inc,
 //
 
-#if NET_2_0
 
 using System.Threading;
 
@@ -35,10 +34,15 @@ namespace System.Transactions
                        ForceRollback (null);
                }
 
+               internal override void InternalOnDone ()
+               {
+                       this.Prepared();                        
+               }
+
                [MonoTODO]
-               public void ForceRollback (Exception ex)
+               public void ForceRollback (Exception e)
                {
-                       tx.Rollback (ex, enlisted);
+                       tx.Rollback (e, enlisted);
                        /* See test RMFail2 */
                        ((ManualResetEvent) waitHandle).Set ();
                }
@@ -80,4 +84,3 @@ namespace System.Transactions
        }
 }
 
-#endif