diff options
author | Diva Canto | 2011-05-12 18:53:22 -0700 |
---|---|---|
committer | Diva Canto | 2011-05-12 18:53:22 -0700 |
commit | 9e310a0c0f9cbe06663fcd28fbd0ade3cb119d3d (patch) | |
tree | d3514708af39dce26d9d2ed774f54c2c8b72fc01 | |
parent | Bummer, can't print the data I wanted to see. Printing just the context. (diff) | |
download | opensim-SC_OLD-9e310a0c0f9cbe06663fcd28fbd0ade3cb119d3d.zip opensim-SC_OLD-9e310a0c0f9cbe06663fcd28fbd0ade3cb119d3d.tar.gz opensim-SC_OLD-9e310a0c0f9cbe06663fcd28fbd0ade3cb119d3d.tar.bz2 opensim-SC_OLD-9e310a0c0f9cbe06663fcd28fbd0ade3cb119d3d.tar.xz |
Sequencing the using and try clauses as they were before, but this shows that that obsolete function is not catching 404's as it should...
-rw-r--r-- | OpenSim/Framework/WebUtil.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs index 0b99e82..e9a1e03 100644 --- a/OpenSim/Framework/WebUtil.cs +++ b/OpenSim/Framework/WebUtil.cs | |||
@@ -976,9 +976,9 @@ namespace OpenSim.Framework | |||
976 | } | 976 | } |
977 | } | 977 | } |
978 | 978 | ||
979 | using (WebResponse resp = request.GetResponse()) | 979 | try |
980 | { | 980 | { |
981 | try | 981 | using (WebResponse resp = request.GetResponse()) |
982 | { | 982 | { |
983 | if (resp.ContentLength > 0) | 983 | if (resp.ContentLength > 0) |
984 | { | 984 | { |
@@ -988,11 +988,11 @@ namespace OpenSim.Framework | |||
988 | respStream.Close(); | 988 | respStream.Close(); |
989 | } | 989 | } |
990 | } | 990 | } |
991 | catch (System.InvalidOperationException) | 991 | } |
992 | { | 992 | catch (System.InvalidOperationException) |
993 | // This is what happens when there is invalid XML | 993 | { |
994 | m_log.WarnFormat("[SynchronousRestObjectRequester]: Invalid XML {0} {1}", requestUrl, typeof(TResponse).ToString()); | 994 | // This is what happens when there is invalid XML |
995 | } | 995 | m_log.WarnFormat("[SynchronousRestObjectRequester]: Invalid XML {0} {1}", requestUrl, typeof(TResponse).ToString()); |
996 | } | 996 | } |
997 | return deserial; | 997 | return deserial; |
998 | } | 998 | } |