diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2009-08-07 10:24:08 +0400 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2009-08-07 10:24:08 +0400 |
| commit | 610596554100831a9193f289a6e8c0669a525a85 (patch) | |
| tree | f8c4b88e92ddc674414c709966aa0fc21a19a1be /mcs/class | |
| parent | c65767432f5b5bb206196ee013463bec2b74a8ba (diff) | |
2009-08-07 Atsushi Enomoto <atsushi@ximian.com>
* ClientRuntime.cs : oops, it should have been committed at a time.
Change .ctor() args. Make some properties auto.
svn path=/trunk/mcs/; revision=139546
Diffstat (limited to 'mcs/class')
| -rw-r--r-- | mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ClientRuntime.cs | 26 |
2 files changed, 9 insertions, 22 deletions
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChangeLog index 60a6d96f1d8..a22d01cc63f 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChangeLog +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChangeLog @@ -1,5 +1,10 @@ 2009-08-07 Atsushi Enomoto <atsushi@ximian.com> + * ClientRuntime.cs : oops, it should have been committed at a time. + Change .ctor() args. Make some properties auto. + +2009-08-07 Atsushi Enomoto <atsushi@ximian.com> + * DispatchRuntime.cs : callback runtime is set later. 2009-08-06 Atsushi Enomoto <atsushi@ximian.com> diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ClientRuntime.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ClientRuntime.cs index 9536fd97337..d5d9d5bab51 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ClientRuntime.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ClientRuntime.cs @@ -39,9 +39,6 @@ namespace System.ServiceModel.Dispatcher = new SynchronizedCollection<IChannelInitializer> (); SynchronizedCollection<IInteractiveChannelInitializer> interactive_channel_initializers = new SynchronizedCollection<IInteractiveChannelInitializer> (); -#if !NET_2_1 - DispatchRuntime dispatch; -#endif SynchronizedCollection<IClientMessageInspector> inspectors = new SynchronizedCollection<IClientMessageInspector> (); ClientOperation.ClientOperationCollection operations @@ -52,24 +49,11 @@ namespace System.ServiceModel.Dispatcher string contract_name, contract_ns; int max_fault_size = 0x10000; // FIXME: not verified. -#if !NET_2_1 - // .ctor() for DispatchRuntime.CallbackClientRuntime - internal ClientRuntime (DispatchRuntime parent) - { - // maybe it could be null, for non-duplex channels. - this.dispatch = parent; - contract_name = dispatch.EndpointDispatcher.ContractName; - contract_ns = dispatch.EndpointDispatcher.ContractNamespace; - } -#endif - // .ctor() for Clients - internal ClientRuntime (ContractDescription contract) + internal ClientRuntime (string name, string ns) { - contract_name = contract.Name; - contract_ns = contract.Namespace; - ContractClientType = contract.ContractType; - CallbackClientType = contract.CallbackContractType; + contract_name = name; + contract_ns = ns; } public Type CallbackClientType { get; set; } @@ -94,9 +78,7 @@ namespace System.ServiceModel.Dispatcher public Type ContractClientType { get; set; } #if !NET_2_1 - public DispatchRuntime CallbackDispatchRuntime { - get { return dispatch; } - } + public DispatchRuntime CallbackDispatchRuntime { get; internal set; } #endif public SynchronizedCollection<IClientMessageInspector> MessageInspectors { |