diff options
author | Melanie | 2009-10-06 17:44:59 +0100 |
---|---|---|
committer | Melanie | 2009-10-06 17:44:59 +0100 |
commit | 0374f1b144f3faf35da39e3925e8abd4b2a8bd04 (patch) | |
tree | 456d3d532c70d32564d35fc3cb9bbc81bdf08b2e /OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs | |
parent | Make sure that keys exist in arrays before trying to access them. (diff) | |
parent | Corrected words in error message. (diff) | |
download | opensim-SC-0374f1b144f3faf35da39e3925e8abd4b2a8bd04.zip opensim-SC-0374f1b144f3faf35da39e3925e8abd4b2a8bd04.tar.gz opensim-SC-0374f1b144f3faf35da39e3925e8abd4b2a8bd04.tar.bz2 opensim-SC-0374f1b144f3faf35da39e3925e8abd4b2a8bd04.tar.xz |
Merge branch 'master' into vehicles
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs b/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs index 8a490f7..4543fd5 100644 --- a/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs +++ b/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs | |||
@@ -28,14 +28,21 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.IO; | 29 | using System.IO; |
30 | using System.Net; | 30 | using System.Net; |
31 | using System.Reflection; | ||
31 | using System.Text; | 32 | using System.Text; |
32 | using System.Xml; | 33 | using System.Xml; |
33 | using System.Xml.Serialization; | 34 | using System.Xml.Serialization; |
34 | 35 | ||
36 | using log4net; | ||
37 | |||
35 | namespace OpenSim.Framework.Servers.HttpServer | 38 | namespace OpenSim.Framework.Servers.HttpServer |
36 | { | 39 | { |
37 | public class SynchronousRestFormsRequester | 40 | public class SynchronousRestFormsRequester |
38 | { | 41 | { |
42 | private static readonly ILog m_log = | ||
43 | LogManager.GetLogger( | ||
44 | MethodBase.GetCurrentMethod().DeclaringType); | ||
45 | |||
39 | /// <summary> | 46 | /// <summary> |
40 | /// Perform a synchronous REST request. | 47 | /// Perform a synchronous REST request. |
41 | /// </summary> | 48 | /// </summary> |
@@ -72,8 +79,9 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
72 | requestStream = request.GetRequestStream(); | 79 | requestStream = request.GetRequestStream(); |
73 | requestStream.Write(buffer.ToArray(), 0, length); | 80 | requestStream.Write(buffer.ToArray(), 0, length); |
74 | } | 81 | } |
75 | catch | 82 | catch (Exception e) |
76 | { | 83 | { |
84 | m_log.DebugFormat("[FORMS]: exception occured on sending request {0}", e.Message); | ||
77 | } | 85 | } |
78 | finally | 86 | finally |
79 | { | 87 | { |
@@ -102,7 +110,10 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
102 | respstring = reader.ReadToEnd(); | 110 | respstring = reader.ReadToEnd(); |
103 | } | 111 | } |
104 | } | 112 | } |
105 | catch { } | 113 | catch (Exception e) |
114 | { | ||
115 | m_log.DebugFormat("[FORMS]: exception occured on receiving reply {0}", e.Message); | ||
116 | } | ||
106 | finally | 117 | finally |
107 | { | 118 | { |
108 | if (respStream != null) | 119 | if (respStream != null) |
@@ -114,6 +125,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
114 | catch (System.InvalidOperationException) | 125 | catch (System.InvalidOperationException) |
115 | { | 126 | { |
116 | // This is what happens when there is invalid XML | 127 | // This is what happens when there is invalid XML |
128 | m_log.DebugFormat("[FORMS]: InvalidOperationException on receiving request"); | ||
117 | } | 129 | } |
118 | return respstring; | 130 | return respstring; |
119 | } | 131 | } |