From 75cb93ada7eeb28a916603c0d72db05a1c751cc6 Mon Sep 17 00:00:00 2001
From: Adam M Rivera <a432511@gmail.com>
Date: Wed, 25 Apr 2012 13:38:05 -0500
Subject: [PATCH] Planner: Added try catch around web request in the parser to
prevent blowing up.
---
.../Utilities/ParameterMetaDataParser.cs | 67 +++++++++++--------
1 file changed, 38 insertions(+), 29 deletions(-)
diff --git a/Tools/ArdupilotMegaPlanner/Utilities/ParameterMetaDataParser.cs b/Tools/ArdupilotMegaPlanner/Utilities/ParameterMetaDataParser.cs
index 5554bbce7..27d475f55 100644
--- a/Tools/ArdupilotMegaPlanner/Utilities/ParameterMetaDataParser.cs
+++ b/Tools/ArdupilotMegaPlanner/Utilities/ParameterMetaDataParser.cs
@@ -37,7 +37,7 @@ namespace ArdupilotMega.Utilities
foreach (string parameterLocation in parameterLocations)
{
// Write the start element for this parameter location
- objXmlTextWriter.WriteStartElement(parameterLocation);
+ objXmlTextWriter.WriteStartElement(parameterLocation.ToLower().Contains("arducopter") ? MainV2.Firmwares.ArduCopter2.ToString() : MainV2.Firmwares.ArduPlane.ToString());
// Read and parse the content.
string dataFromAddress = ReadDataFromAddress(parameterLocation);
@@ -273,46 +273,55 @@ namespace ArdupilotMega.Utilities
log.Info(address);
- var request = WebRequest.Create(address);
-
- // Plenty of timeout
- request.Timeout = 10000;
+ // Make sure we don't blow up if the user is not connected or the endpoint is not available
+ try
+ {
+ var request = WebRequest.Create(address);
- // Set the Method property of the request to GET.
- request.Method = "GET";
+ // Plenty of timeout
+ request.Timeout = 10000;
- // Get the response.
- using (var response = request.GetResponse())
- {
- // Display the status.
- log.Info(((HttpWebResponse) response).StatusDescription);
+ // Set the Method property of the request to GET.
+ request.Method = "GET";
- // Get the stream containing content returned by the server.
- using (var dataStream = response.GetResponseStream())
+ // Get the response.
+ using (var response = request.GetResponse())
{
- if (dataStream != null)
+ // Display the status.
+ log.Info(((HttpWebResponse)response).StatusDescription);
+
+ // Get the stream containing content returned by the server.
+ using (var dataStream = response.GetResponseStream())
{
- // Open the stream using a StreamReader for easy access.
- using (var reader = new StreamReader(dataStream))
+ if (dataStream != null)
{
- // Store the data to return
- data = reader.ReadToEnd();
+ // Open the stream using a StreamReader for easy access.
+ using (var reader = new StreamReader(dataStream))
+ {
+ // Store the data to return
+ data = reader.ReadToEnd();
- // Close the reader
- reader.Close();
- }
+ // Close the reader
+ reader.Close();
+ }
- // Close the datastream
- dataStream.Close();
+ // Close the datastream
+ dataStream.Close();
+ }
}
+
+ // Close the response
+ response.Close();
}
- // Close the response
- response.Close();
+ // Return the data
+ return data;
}
-
- // Return the data
- return data;
+ catch (WebException ex)
+ {
+ log.Error(String.Format("The request to {0} failed.", address), ex);
+ }
+ return string.Empty;
}
}
}
--
GitLab