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

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileChecker.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileChecker.cs
index a499bf592840a8095d786c341088748c3573966d..63c78c2cc849f8a7cfccc59880137160b14f86e3 100644 (file)
--- a/mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileChecker.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileChecker.cs
@@ -216,9 +216,12 @@ namespace System.Web.Services.Description
                                        OperationMessage om;
                                        if (mb is InputBinding) om = op.Messages.Input;
                                        else if (mb is OutputBinding) om = op.Messages.Output;
-                                       else if (mb is FaultBinding) om = op.Messages.Fault;
+                                       else if (mb is FaultBinding) om = op.Faults [mb.Name];
                                        else return null;
-                                       return ctx.Services.GetMessage (om.Message);
+                                       if (om != null)
+                                               return ctx.Services.GetMessage (om.Message);
+                                       else
+                                               return null;
                                }
                        return null;
                }
@@ -317,8 +320,10 @@ namespace System.Web.Services.Description
                
                public override void Check (ConformanceCheckContext ctx, XmlSchemaSimpleTypeUnion value)
                {
-                       foreach (XmlQualifiedName name in value.MemberTypes)
-                               CheckSchemaQName (ctx, value, name);
+                       if (value.MemberTypes != null) {
+                               foreach (XmlQualifiedName name in value.MemberTypes)
+                                       CheckSchemaQName (ctx, value, name);
+                       }
                }
                
                // Helper methods

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 5ad275167423786f8fba237c40ad672e40fafca6..8cebcae58bb45c9e8230d580a528f159df7a5bb6 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-09-05  Lluis Sanchez Gual <lluis@novell.com>
+
+       * BasicProfileChecker.cs: In FindMessage, get faults messages from the
+         Faults collection. Added null check.
+
 2006-09-05  Ankit Jain  <jankit@novell.com>
 
        * ServiceDescriptionImportWarnings.cs: Remove [Serializable].