2006-12-12 Atsushi Enomoto <atsushi@ximian.com>

	* ProtocolImporter.cs : (ImportsEncodedNamespace) XmlSchemaExternal
	  could be of other types than XmlSchemaImport.

svn path=/branches/atsushi/mcs/; revision=69294

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog b/mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog
index d84fcc69d62027570a58711cea6addd4eeca42f7..9f387bdd47a52fa0c6bd222f9f64c2f94e4e3276 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-12  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * ProtocolImporter.cs : (ImportsEncodedNamespace) XmlSchemaExternal
+         could be of other types than XmlSchemaImport.
+
 2006-12-04  Atsushi Enomoto  <atsushi@ximian.com>
 
        * SoapProtocolImporter.cs : added trivial IsSoapEncodingPresent().

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ProtocolImporter.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/ProtocolImporter.cs
index 3d47a2a339f258a818b74fa4258853b04112c64a..c6420a15569c4bfa674bcd1f1980be4fd10932d2 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/ProtocolImporter.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/ProtocolImporter.cs
@@ -545,7 +545,7 @@ namespace System.Web.Services.Description {
                        foreach (XmlSchemaObject ob in sc.Includes)
                        {
                                XmlSchemaImport import = ob as XmlSchemaImport;
-                               if (import.Namespace == SoapProtocolReflector.EncodingNamespace) return true;
+                               if (import != null && import.Namespace == SoapProtocolReflector.EncodingNamespace) return true;
                        }
                        return false;
                }