Fix dummy NRE mistake

h3xds1nz · h3xds1nz · commit a1c2ab70de55 · 2025-01-28T15:57:32.000+01:00
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/MS/Impl/AssemblyNamespacePair.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/MS/Impl/AssemblyNamespacePair.cs
@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
 
-using System.Diagnostics;
 using System.Reflection;
 
 namespace System.Xaml.MS.Impl
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Schema/XamlNamespace.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Schema/XamlNamespace.cs
@@ -169,7 +169,7 @@ internal int RevisionNumber
         {
             // The only external mutation we allow is adding new namespaces. So the count of
             // namespaces also serves as a revision number.
-            get => (_assemblyNamespaces != null) ? _assemblyNamespaces.Length : 0;
+            get => _assemblyNamespaces?.Length ?? 0;
         }
 
         private Type TryGetType(string typeName)
@@ -279,12 +279,13 @@ internal void AddAssemblyNamespacePair(AssemblyNamespacePair pair)
             }
             else
             {
+                // Copy items over to the new collection
                 assemblyNamespacesCopy = new AssemblyNamespacePair[_assemblyNamespaces.Length + 1];
+                _assemblyNamespaces.CopyTo(assemblyNamespacesCopy, 0);
             }
 
-            // Copy over and add new item
-            _assemblyNamespaces.CopyTo(assemblyNamespacesCopy, 0);
-            assemblyNamespacesCopy[assemblyNamespacesCopy.Length - 1] = pair;
+            // Add new pair as the last one
+            assemblyNamespacesCopy[^1] = pair;
 
             _assemblyNamespaces = assemblyNamespacesCopy;
         }

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ internal int RevisionNumber`
`169`	`169`	`{`
`170`	`170`	`// The only external mutation we allow is adding new namespaces. So the count of`
`171`	`171`	`// namespaces also serves as a revision number.`
`172`		`- get => (_assemblyNamespaces != null) ? _assemblyNamespaces.Length : 0;`
	`172`	`+ get => _assemblyNamespaces?.Length ?? 0;`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`private Type TryGetType(string typeName)`
`@@ -279,12 +279,13 @@ internal void AddAssemblyNamespacePair(AssemblyNamespacePair pair)`
`279`	`279`	`}`
`280`	`280`	`else`
`281`	`281`	`{`
	`282`	`+ // Copy items over to the new collection`
`282`	`283`	`assemblyNamespacesCopy = new AssemblyNamespacePair[_assemblyNamespaces.Length + 1];`
	`284`	`+ _assemblyNamespaces.CopyTo(assemblyNamespacesCopy, 0);`
`283`	`285`	`}`
`284`	`286`
`285`		`- // Copy over and add new item`
`286`		`- _assemblyNamespaces.CopyTo(assemblyNamespacesCopy, 0);`
`287`		`- assemblyNamespacesCopy[assemblyNamespacesCopy.Length - 1] = pair;`
	`287`	`+ // Add new pair as the last one`
	`288`	`+ assemblyNamespacesCopy[^1] = pair;`
`288`	`289`
`289`	`290`	`_assemblyNamespaces = assemblyNamespacesCopy;`
`290`	`291`	`}`