CanImport() just returns false, without throwing error.

diff --git a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/XsdDataContractImporter.cs b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/XsdDataContractImporter.cs
index bb416dcef777c4f4446737064cd63afcffd82b61..18f0bf1f906b24024faf8da57b5a53d332655a5b 100644 (file)
--- a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/XsdDataContractImporter.cs
+++ b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/XsdDataContractImporter.cs
@@ -179,7 +179,7 @@ namespace System.Runtime.Serialization
                                return true; // while it just ignores...
 
                        if (!schemas.GlobalTypes.Contains (typeName))
-                               throw new InvalidDataContractException (String.Format ("Type {0} is not found in the schemas", typeName));
+                               return false;
 
                        return CanImport (schemas, schemas.GlobalTypes [typeName] as XmlSchemaType);
                }

diff --git a/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XsdDataContractImporterTest.cs b/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XsdDataContractImporterTest.cs
index f3147b4d51646616fead41564218c60e4ffa94da..725e24845ac2c505e3c993d72b3c4569313a4237 100644 (file)
--- a/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XsdDataContractImporterTest.cs
+++ b/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XsdDataContractImporterTest.cs
@@ -121,7 +121,6 @@ namespace MonoTests.System.Runtime.Serialization
                }
 
                [Test]
-               [Category ("NotWorking")]
                public void CanImportTest ()
                {
                        NewXmlSchemaSet ();
@@ -147,7 +146,6 @@ namespace MonoTests.System.Runtime.Serialization
                }
 
                [Test]
-               [Category ("NotWorking")]
                public void CanImportTest2 ()
                {
                        NewXmlSchemaSet ();