Author: tberman
Date: 2005-12-02 00:55:53 -0500 (Fri, 02 Dec 2005)
New Revision: 53822

Modified:
   trunk/monodevelop/Core/src/MonoDevelop.Core/ChangeLog
   
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.AddIns.Setup/SetupService.cs
Log:
2005-12-01  Todd Berman  <[EMAIL PROTECTED]>

        * MonoDevelop.Core.AddIns.Setup/SetupService.cs: Make ReadObject
        return null if it encounters an error. This happens with 0 length
        files.



Modified: trunk/monodevelop/Core/src/MonoDevelop.Core/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Core/ChangeLog       2005-12-02 
05:27:17 UTC (rev 53821)
+++ trunk/monodevelop/Core/src/MonoDevelop.Core/ChangeLog       2005-12-02 
05:55:53 UTC (rev 53822)
@@ -1,3 +1,9 @@
+2005-12-01  Todd Berman  <[EMAIL PROTECTED]>
+
+       * MonoDevelop.Core.AddIns.Setup/SetupService.cs: Make ReadObject
+       return null if it encounters an error. This happens with 0 length
+       files.
+
 2005-11-29  David Makovský <[EMAIL PROTECTED]>
 
        * MonoDevelop.Core.AddIns.Setup/SetupService.cs:

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.AddIns.Setup/SetupService.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.AddIns.Setup/SetupService.cs
   2005-12-02 05:27:17 UTC (rev 53821)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.AddIns.Setup/SetupService.cs
   2005-12-02 05:55:53 UTC (rev 53822)
@@ -1026,6 +1026,8 @@
                        try {
                                XmlSerializer ser = new XmlSerializer (type);
                                return ser.Deserialize (r);
+                       } catch {
+                               return null;
                        } finally {
                                r.Close ();
                        }

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to