couple of warning cleanups.

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

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
index ee21be27343b9e8548162be72ac36b46d9de0087..ed0d13968ff376ed797d937fb438fc6d2f5a4495 100755 (executable)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-08  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * XmlReaderBodyWriter.cs, MessageFault.cs: warning cleanups.
+
 2010-07-06  Atsushi Enomoto  <atsushi@ximian.com>
 
        * ChannelFactoryBase.cs : null via uri parameter is not allowed.

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageFault.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageFault.cs
index 79168b1c564d3f892472806f1321a7af5593b97f..b02bfb52bfdb874c8751674c04b31d5d384c6e2e 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageFault.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageFault.cs
@@ -47,7 +47,6 @@ namespace System.ServiceModel.Channels
                        } catch (XmlException ex) {
                                throw new CommunicationException ("Received an invalid SOAP Fault message", ex);
                        }
-                       throw new InvalidOperationException ("The input message is not a SOAP envelope.");
                }
 
                static MessageFault CreateFault11 (Message message, int maxBufferSize)

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/XmlReaderBodyWriter.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/XmlReaderBodyWriter.cs
index 1cca9653e1cc8c0268df130ae58ac15293a0565c..81ad6dd6dc8507a3526c70ed91491718a9c7d060 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/XmlReaderBodyWriter.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/XmlReaderBodyWriter.cs
@@ -73,7 +73,6 @@ namespace System.ServiceModel.Channels
                                xw.WriteStartElement (reader.Prefix, reader.LocalName, reader.NamespaceURI);
                                xw.WriteAttributes (reader, false);
 
-                               var nsmgr = new XmlNamespaceManager (reader.NameTable);
                                var inr = reader as IXmlNamespaceResolver;
                                if (inr != null)
                                        foreach (var p in inr.GetNamespacesInScope (XmlNamespaceScope.ExcludeXml))

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ChangeLog
index 5f3be1f1eb03d1a64968785e0c7b425df9459730..7b1d10ea1b8a2aeae8b7a294b7678bd1a758e1ef 100755 (executable)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-08  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * ClientCredentialsElement.cs : warning cleanup.
+
 2010-05-31  Atsushi Enomoto  <atsushi@ximian.com>
 
        * ClientCredentialsElement.cs, HttpDigestClientElement.cs,

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ClientCredentialsElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ClientCredentialsElement.cs
index 03f451f0c7c4eba2eb18bf272451bf90d0d640cc..ce61e96975ac4575bf67d19c574339737399c41c 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ClientCredentialsElement.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ClientCredentialsElement.cs
@@ -35,13 +35,12 @@ using System.Configuration;
 using System.Net;
 using System.Net.Security;
 using System.Reflection;
-using System.Security.Cryptography.X509Certificates;
-using System.Security.Principal;
 using System.IdentityModel.Claims;
 using System.IdentityModel.Policy;
 using System.IdentityModel.Tokens;
 using System.IdentityModel.Selectors;
 using System.Security.Cryptography.X509Certificates;
+using System.Security.Principal;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using System.ServiceModel.Description;

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
index 0f8c9c0b1ef6fabf2df4c098902e146c0082a0c7..e5a7dd5c44cd31b7253c22a8fae93b30c8cb8cfe 100755 (executable)
--- a/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-08  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * ServiceRuntimeChannel.cs, NetNamedPipeBinding.cs,
+         ClientProxyGenerator.cs NetPeerTcpBinding.cs, DuplexClientBase.cs:
+         couple of warning cleanups.
+
 2010-07-06  Atsushi Enomoto  <atsushi@ximian.com>
 
        * ClientRuntimeChannel.cs : give non-null Via uri.

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ClientProxyGenerator.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ClientProxyGenerator.cs
index cb3885db9ff9bc85c1ddaa87a0ba8861c17e8c99..91c74ccae17e43143ad00e646535b9134da4fc96 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel/ClientProxyGenerator.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/ClientProxyGenerator.cs
@@ -57,7 +57,7 @@ namespace System.ServiceModel
                        ClientProxyKey key = o as ClientProxyKey;
                        if (key == null)
                                return false;
-                       return contractInterface == key.contractInterface && cd == key.cd && duplex == duplex;
+                       return contractInterface == key.contractInterface && cd == key.cd && duplex == key.duplex;
                }
        }
 

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/DuplexClientBase.cs b/mcs/class/System.ServiceModel/System.ServiceModel/DuplexClientBase.cs
index 6c11aedf5a58ef9b8d8d3dd4d00ee2ab800250da..ceeae118589b4b38a533727234bc775ad4f19267 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel/DuplexClientBase.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/DuplexClientBase.cs
@@ -89,7 +89,7 @@ namespace System.ServiceModel
                        ChannelFactory = new DuplexChannelFactory<TChannel> (instance, endpointConfigurationName, remoteAddress);
                }
 
-               internal virtual void Initialize (InstanceContext instance,
+               internal override void Initialize (InstanceContext instance,
                        Binding binding, EndpointAddress remoteAddress)
                {
                        ChannelFactory = new DuplexChannelFactory<TChannel> (instance, binding, remoteAddress);

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/NetNamedPipeBinding.cs b/mcs/class/System.ServiceModel/System.ServiceModel/NetNamedPipeBinding.cs
index 8435f07b3d3d275dc5e86bcbbb6dce2d50e359a3..a395656fa273e9dabb312db8991e1a0c68b4c04d 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel/NetNamedPipeBinding.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/NetNamedPipeBinding.cs
@@ -75,7 +75,7 @@ namespace System.ServiceModel
                }
 
                [MonoTODO]
-               public new long MaxBufferPoolSize {
+               public long MaxBufferPoolSize {
                        get { return transport.MaxBufferPoolSize; }
                        set { transport.MaxBufferPoolSize = value; }
                }

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/NetPeerTcpBinding.cs b/mcs/class/System.ServiceModel/System.ServiceModel/NetPeerTcpBinding.cs
index a59ef1515b73a1bfaf1a50ef53144868692b9daf..222e6b762207b13bbef676c37173a3bb40179212 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel/NetPeerTcpBinding.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/NetPeerTcpBinding.cs
@@ -68,7 +68,7 @@ namespace System.ServiceModel
                }
 
                [MonoTODO]
-               public new long MaxBufferPoolSize {
+               public long MaxBufferPoolSize {
                        get { return transport.MaxBufferPoolSize; }
                        set { transport.MaxBufferPoolSize = value; }
                }

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ServiceRuntimeChannel.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ServiceRuntimeChannel.cs
index 9cb3d1b7de684a6352b004775ee00cd04b8561d8..9c780c4cdff50a7dc958f718cd21bc5f50df06c9 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel/ServiceRuntimeChannel.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/ServiceRuntimeChannel.cs
@@ -55,7 +55,7 @@ namespace System.ServiceModel.MonoInternal
                        set { client.AllowOutputBatching = value; }
                }
 
-               public virtual TimeSpan OperationTimeout {
+               public override TimeSpan OperationTimeout {
                        get { return client.OperationTimeout; }
                        set { client.OperationTimeout = value; }
                }