2009-09-02 Marek Safar <marek.safar@gmail.com>

	A fix for bug #535395
	* namespace.cs: Resolve context can be null.

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

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index bba05564df3546c90563f7ed1481d4434616bc15..bc3c198f8aaec285bed99230d1798281987d8862 100644 (file)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-02  Marek Safar  <marek.safar@gmail.com>
+
+       A fix for bug #535395
+       * namespace.cs: Resolve context can be null.
+
 2009-08-25  Marek Safar  <marek.safar@gmail.com>
 
        A fix for bug #533912

diff --git a/mcs/mcs/namespace.cs b/mcs/mcs/namespace.cs
index 050f71becde826b2c2ceb9501d16ee221f58b4d7..37277258481af8e0742cb5b2f0cd425b47437b51 100644 (file)
--- a/mcs/mcs/namespace.cs
+++ b/mcs/mcs/namespace.cs
@@ -783,6 +783,9 @@ namespace Mono.CSharp {
                                if (resolved != null || value == null)
                                        return resolved;
 
+                               if (rc == null)
+                                       return null;
+
                                resolved = value.GetTypeExpression ().ResolveAsTypeStep (rc, false);
                                if (resolved == null) {
                                        value = null;