aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/WebUtil.cs
diff options
context:
space:
mode:
authorOren Hurvitz2014-04-01 15:00:22 +0300
committerOren Hurvitz2014-04-02 06:32:41 +0100
commitbbfda8e19e4a66d87ba1de80083a0da1eaf9ddfb (patch)
tree1c6be779994d00cfcfcfc849fcc71ac7a8ffa438 /OpenSim/Framework/WebUtil.cs
parentFixed the "Update Asset" handler: it was looking for the Asset ID in the wron... (diff)
downloadopensim-SC-bbfda8e19e4a66d87ba1de80083a0da1eaf9ddfb.zip
opensim-SC-bbfda8e19e4a66d87ba1de80083a0da1eaf9ddfb.tar.gz
opensim-SC-bbfda8e19e4a66d87ba1de80083a0da1eaf9ddfb.tar.bz2
opensim-SC-bbfda8e19e4a66d87ba1de80083a0da1eaf9ddfb.tar.xz
Fixed last-resort sending of error response (HTTP 500) when an error occurs while handling a request.
The previous code didn't actually send the response, so the caller was stuck until the timeout (100 seconds).
Diffstat (limited to 'OpenSim/Framework/WebUtil.cs')
-rw-r--r--OpenSim/Framework/WebUtil.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 40c1634..768ff16 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -1203,9 +1203,9 @@ namespace OpenSim.Framework
1203 if (hwr != null && hwr.StatusCode == HttpStatusCode.NotFound) 1203 if (hwr != null && hwr.StatusCode == HttpStatusCode.NotFound)
1204 return deserial; 1204 return deserial;
1205 else 1205 else
1206 m_log.ErrorFormat( 1206 m_log.Error(string.Format(
1207 "[SynchronousRestObjectRequester]: WebException for {0} {1} {2}: {3} {4}", 1207 "[SynchronousRestObjectRequester]: WebException for {0} {1} {2} ",
1208 verb, requestUrl, typeof(TResponse).ToString(), e.Message, e.StackTrace); 1208 verb, requestUrl, typeof(TResponse).ToString()), e);
1209 } 1209 }
1210 } 1210 }
1211 catch (System.InvalidOperationException) 1211 catch (System.InvalidOperationException)
@@ -1217,9 +1217,9 @@ namespace OpenSim.Framework
1217 } 1217 }
1218 catch (Exception e) 1218 catch (Exception e)
1219 { 1219 {
1220 m_log.DebugFormat( 1220 m_log.Debug(string.Format(
1221 "[SynchronousRestObjectRequester]: Exception on response from {0} {1}: {2}{3}", 1221 "[SynchronousRestObjectRequester]: Exception on response from {0} {1} ",
1222 verb, requestUrl, e.Message, e.StackTrace); 1222 verb, requestUrl), e);
1223 } 1223 }
1224 1224
1225 int tickdiff = Util.EnvironmentTickCountSubtract(tickstart); 1225 int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);