Merge remote-tracking branch 'refs/remotes/origin/dev'

maartenba · maartenba · commit 0b1ed5749520 · 2016-02-09T10:06:47.000+01:00
diff --git a/src/NuGet.Server/Infrastructure/ServerPackageStore.cs b/src/NuGet.Server/Infrastructure/ServerPackageStore.cs
@@ -46,8 +46,11 @@ private void Load()
                     {
                         using (var stream = _fileSystem.OpenFile(_fileName))
                         {
-                            _packages.AddRange(
-                                _packagesSerializer.Deserialize(stream));
+                            var deserializedPackages = _packagesSerializer.Deserialize(stream);
+                            if (deserializedPackages != null)
+                            {
+                                _packages.AddRange(deserializedPackages);
+                            }
                         }
                     }
                     catch (SerializationException)

Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,11 @@ private void Load()`
`46`	`46`	`{`
`47`	`47`	`using (var stream = _fileSystem.OpenFile(_fileName))`
`48`	`48`	`{`
`49`		`- _packages.AddRange(`
`50`		`- _packagesSerializer.Deserialize(stream));`
	`49`	`+ var deserializedPackages = _packagesSerializer.Deserialize(stream);`
	`50`	`+ if (deserializedPackages != null)`
	`51`	`+ {`
	`52`	`+ _packages.AddRange(deserializedPackages);`
	`53`	`+ }`
`51`	`54`	`}`
`52`	`55`	`}`
`53`	`56`	`catch (SerializationException)`