diff options
| author | Michael Hutchinson <mhutchinson@novell.com> | 2009-12-12 06:22:11 +0300 |
|---|---|---|
| committer | Michael Hutchinson <mhutchinson@novell.com> | 2009-12-12 06:22:11 +0300 |
| commit | e1ce163be71061726734eed1a6d6cefc3e82a94c (patch) | |
| tree | 23ddc816c337c68ec726798d5a9087448072757a | |
| parent | fc89b007891f8dd108e18a7918510c60ccb2954c (diff) | |
2009-12-11 Michael Hutchinson <mhutchinson@novell.com>
* MonoDevelop.Core.Assemblies/TargetFramework.cs: Fix a
possible NRE that could prevent SystemAssemblyService from
fully initializing.
svn path=/branches/monodevelop/main/2.2/; revision=148327
| -rw-r--r-- | main/src/core/MonoDevelop.Core/ChangeLog | 6 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/TargetFramework.cs | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/main/src/core/MonoDevelop.Core/ChangeLog b/main/src/core/MonoDevelop.Core/ChangeLog index e94e5830f5..32e5848793 100644 --- a/main/src/core/MonoDevelop.Core/ChangeLog +++ b/main/src/core/MonoDevelop.Core/ChangeLog @@ -1,5 +1,11 @@ 2009-12-11 Michael Hutchinson <mhutchinson@novell.com> + * MonoDevelop.Core.Assemblies/TargetFramework.cs: Fix a + possible NRE that could prevent SystemAssemblyService from + fully initializing. + +2009-12-11 Michael Hutchinson <mhutchinson@novell.com> + * MonoDevelop.Core.Assemblies/AssemblyContext.cs: Always set the package name so that package name lookups work on framework packages. diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/TargetFramework.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/TargetFramework.cs index 36343f577c..5bb9fbbc85 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/TargetFramework.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/TargetFramework.cs @@ -114,7 +114,7 @@ namespace MonoDevelop.Core.Assemblies internal TargetFrameworkBackend CreateBackendForRuntime (TargetRuntime runtime) { - if (FrameworkNode == null) + if (FrameworkNode == null || FrameworkNode.ChildNodes == null) return null; foreach (TypeExtensionNode node in FrameworkNode.ChildNodes) { TargetFrameworkBackend backend = (TargetFrameworkBackend) node.CreateInstance (typeof (TargetFrameworkBackend)); |