aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-01-31 00:51:22 +0000
committerJustin Clark-Casey (justincc)2014-01-31 00:51:22 +0000
commitb2878eb77354ea54a0a5e92fc30c3cd3ba1984fa (patch)
tree55094e48f86a95630e3854c64898ce146df063ed /OpenSim/Framework
parentMerge branch 'justincc-master' (diff)
parentMake sure Web streams are disposed after use (diff)
downloadopensim-SC_OLD-b2878eb77354ea54a0a5e92fc30c3cd3ba1984fa.zip
opensim-SC_OLD-b2878eb77354ea54a0a5e92fc30c3cd3ba1984fa.tar.gz
opensim-SC_OLD-b2878eb77354ea54a0a5e92fc30c3cd3ba1984fa.tar.bz2
opensim-SC_OLD-b2878eb77354ea54a0a5e92fc30c3cd3ba1984fa.tar.xz
Merge branch 'justincc-master'
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/WebUtil.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index bcf6af8..54a6c0c 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -1030,7 +1030,7 @@ namespace OpenSim.Framework
1030 finally 1030 finally
1031 { 1031 {
1032 if (requestStream != null) 1032 if (requestStream != null)
1033 requestStream.Close(); 1033 requestStream.Dispose();
1034 1034
1035 // capture how much time was spent writing 1035 // capture how much time was spent writing
1036 tickdata = Util.EnvironmentTickCountSubtract(tickstart); 1036 tickdata = Util.EnvironmentTickCountSubtract(tickstart);
@@ -1183,7 +1183,7 @@ namespace OpenSim.Framework
1183 finally 1183 finally
1184 { 1184 {
1185 if (requestStream != null) 1185 if (requestStream != null)
1186 requestStream.Close(); 1186 requestStream.Dispose();
1187 1187
1188 // capture how much time was spent writing 1188 // capture how much time was spent writing
1189 tickdata = Util.EnvironmentTickCountSubtract(tickstart); 1189 tickdata = Util.EnvironmentTickCountSubtract(tickstart);
@@ -1268,4 +1268,4 @@ namespace OpenSim.Framework
1268 return deserial; 1268 return deserial;
1269 } 1269 }
1270 } 1270 }
1271} \ No newline at end of file 1271}