2010-04-02 Atsushi Enomoto <atsushi@ximian.com>

	* ClientOperation.cs : do not automatically fill FaultContractInfos.

svn path=/trunk/mcs/; revision=154693

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChangeLog
index 3aa00d14f1d5c3919e40b541165ce08920a64ccc..d216da53653c7a77d55f1ddab9cc57055c420ea1 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-02  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * ClientOperation.cs : do not automatically fill FaultContractInfos.
+
 2010-04-02  Atsushi Enomoto  <atsushi@ximian.com>
 
        * OperationInvokerHandler.cs : implement FaultContractInfos support.

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ClientOperation.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ClientOperation.cs
index f197245b5206a18a2ab272f068a3943bca2296d0..9d2c92e445beb0bd5bb5d714d2ab7b691999e6c1 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ClientOperation.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ClientOperation.cs
@@ -61,7 +61,7 @@ namespace System.ServiceModel.Dispatcher
                SynchronizedCollection<IParameterInspector> inspectors
                        = new SynchronizedCollection<IParameterInspector> ();
 #if !NET_2_1
-               SynchronizedCollection<FaultContractInfo> fault_contract_infos;
+               SynchronizedCollection<FaultContractInfo> fault_contract_infos = new SynchronizedCollection<FaultContractInfo> ();
 #endif
 
                public ClientOperation (ClientRuntime parent,
@@ -106,15 +106,7 @@ namespace System.ServiceModel.Dispatcher
 
 #if !NET_2_1
                public SynchronizedCollection<FaultContractInfo> FaultContractInfos {
-                       get {
-                               if (fault_contract_infos == null) {
-                                       var l = new SynchronizedCollection<FaultContractInfo> ();
-                                       foreach (var f in Description.Faults)
-                                               l.Add (new FaultContractInfo (f.Action, f.DetailType));
-                                       fault_contract_infos = l;
-                               }
-                               return fault_contract_infos;
-                       }
+                       get { return fault_contract_infos; }
                }
 #endif