Merge pull request #3528 from BrzVlad/fix-sgen-check-before-collections

[mono.git] / mcs / class / System.ServiceModel / System.ServiceModel.Channels / FaultConverter.cs

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/FaultConverter.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/FaultConverter.cs
index 23c8081ebebe84c480ffac4f03540850c6ae5a3f..a2918a06e6dcb4e573c28addc3a4453b311dc60b 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/FaultConverter.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/FaultConverter.cs
@@ -47,20 +47,20 @@ namespace System.ServiceModel.Channels
 
                [MonoTODO]
                protected abstract bool OnTryCreateException (
-                       Message message, MessageFault fault, out Exception error);
+                       Message message, MessageFault fault, out Exception exception);
 
                [MonoTODO]
                protected abstract bool OnTryCreateFaultMessage (
-                       Exception error, out Message message);
+                       Exception exception, out Message message);
 
-               public bool TryCreateException (Message message, MessageFault fault, out Exception error)
+               public bool TryCreateException (Message message, MessageFault fault, out Exception exception)
                {
-                       return OnTryCreateException (message, fault, out error);
+                       return OnTryCreateException (message, fault, out exception);
                }
 
-               public bool TryCreateFaultMessage (Exception error, out Message message)
+               public bool TryCreateFaultMessage (Exception exception, out Message message)
                {
-                       return OnTryCreateFaultMessage (error, out message);
+                       return OnTryCreateFaultMessage (exception, out message);
                }
        }
 
@@ -137,7 +137,7 @@ namespace System.ServiceModel.Channels
 
                        OperationContext ctx = OperationContext.Current;
                        // FIXME: support more fault code depending on the exception type.
-#if !NET_2_1 && !XAMMAC_4_5
+#if !MOBILE && !XAMMAC_4_5
                        // FIXME: set correct fault reason.
                        if (ctx != null && ctx.EndpointDispatcher.ChannelDispatcher.IncludeExceptionDetailInFaults) {
                                ExceptionDetail detail = new ExceptionDetail (error);