From: unknown <tom@.(none)>
Date: Sat, 22 Oct 2011 03:52:36 +0000 (+0900)
Subject: na-get-lib,チケット #26588 （ソフトウェアインストールの）異常終了後に AppliStation が起動不可になる問題の暫定対処
X-Git-Tag: v1.4.0~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9efa3bb1403c2e7144f8e8c92e600d51da3aa515;p=applistation%2FAppliStation.git

na-get-lib,チケット #26588 （ソフトウェアインストールの）異常終了後に AppliStation が起動不可になる問題の暫定対処
---

diff --git a/na-get-lib/NaGet.Packages/PackageListsManager.cs b/na-get-lib/NaGet.Packages/PackageListsManager.cs
index 34bb015..babf85e 100644
--- a/na-get-lib/NaGet.Packages/PackageListsManager.cs
+++ b/na-get-lib/NaGet.Packages/PackageListsManager.cs
@@ -127,7 +127,10 @@ namespace NaGet.Packages
 			PackageList<InstalledPackage> pkgList = new PackageList<InstalledPackage>();
 			if (Directory.Exists(NaGet.Env.ArchiveProgramFiles)) {
 				foreach (string path in NaGet.Utils.ExtendWildcardFile(NaGet.Env.ArchiveProgramFiles, Path.Combine("*", ".applistation.package.xml"))) {
-					pkgList.AddPackage(NaGet.Utils.GetDeserializedObject<InstalledPackage>(path));
+					try {
+						pkgList.AddPackage(NaGet.Utils.GetDeserializedObject<InstalledPackage>(path));
+					} catch (Exception) {
+					}
 				}
 				this.installedPkgList = pkgList;
 			}
diff --git a/na-get-lib/NaGet/Utils.cs b/na-get-lib/NaGet/Utils.cs
index 3e511b6..96c72ab 100644
--- a/na-get-lib/NaGet/Utils.cs
+++ b/na-get-lib/NaGet/Utils.cs
@@ -385,7 +385,9 @@ namespace NaGet
 		{
 			object retVal = null;
 			using (FileStream fs = new FileStream(path, FileMode.Open, FileAccess.Read)) {
-				retVal = sr.Deserialize(fs);
+				using (System.Xml.XmlReader xreader = System.Xml.XmlReader.Create(fs)) {
+					retVal = sr.Deserialize(xreader);
+				}
 			}
 			return retVal;
 		}