diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/WebUtil.cs | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs b/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs index 4543fd5..b0cf34d 100644 --- a/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs +++ b/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs | |||
@@ -81,7 +81,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
81 | } | 81 | } |
82 | catch (Exception e) | 82 | catch (Exception e) |
83 | { | 83 | { |
84 | m_log.DebugFormat("[FORMS]: exception occured on sending request {0}", e.Message); | 84 | m_log.DebugFormat("[FORMS]: exception occured on sending request to {0}: {1}", requestUrl, e.Message); |
85 | } | 85 | } |
86 | finally | 86 | finally |
87 | { | 87 | { |
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs index 2843e20..94862a6 100644 --- a/OpenSim/Framework/WebUtil.cs +++ b/OpenSim/Framework/WebUtil.cs | |||
@@ -146,18 +146,23 @@ namespace OpenSim.Framework | |||
146 | { | 146 | { |
147 | using (Stream responseStream = response.GetResponseStream()) | 147 | using (Stream responseStream = response.GetResponseStream()) |
148 | { | 148 | { |
149 | string responseStr = null; | ||
150 | |||
149 | try | 151 | try |
150 | { | 152 | { |
151 | string responseStr = responseStream.GetStreamString(); | 153 | responseStr = responseStream.GetStreamString(); |
152 | OSD responseOSD = OSDParser.Deserialize(responseStr); | 154 | OSD responseOSD = OSDParser.Deserialize(responseStr); |
153 | if (responseOSD.Type == OSDType.Map) | 155 | if (responseOSD.Type == OSDType.Map) |
154 | return (OSDMap)responseOSD; | 156 | return (OSDMap)responseOSD; |
155 | else | 157 | else |
156 | errorMessage = "Response format was invalid."; | 158 | errorMessage = "Response format was invalid."; |
157 | } | 159 | } |
158 | catch | 160 | catch (Exception ex) |
159 | { | 161 | { |
160 | errorMessage = "Failed to parse the response."; | 162 | if (!String.IsNullOrEmpty(responseStr)) |
163 | errorMessage = "Failed to parse the response:\n" + responseStr; | ||
164 | else | ||
165 | errorMessage = "Failed to retrieve the response: " + ex.Message; | ||
161 | } | 166 | } |
162 | } | 167 | } |
163 | } | 168 | } |