aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorOren Hurvitz2014-08-05 19:09:11 +0300
committerJustin Clark-Casey2014-08-08 20:46:59 +0100
commit3176237169310fa4a5de00684238e537967cf5dd (patch)
tree835e430cff4fde5ea4318045cd353effa67a9168
parentMake currently unfiltered EventQueue log messages only appear now at DebugLev... (diff)
downloadopensim-SC_OLD-3176237169310fa4a5de00684238e537967cf5dd.zip
opensim-SC_OLD-3176237169310fa4a5de00684238e537967cf5dd.tar.gz
opensim-SC_OLD-3176237169310fa4a5de00684238e537967cf5dd.tar.bz2
opensim-SC_OLD-3176237169310fa4a5de00684238e537967cf5dd.tar.xz
Fixed premature closing of the connection in DataSnapshotManager
-rw-r--r--OpenSim/Region/DataSnapshot/DataSnapshotManager.cs28
1 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 33899aa..66f768b 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -392,22 +392,22 @@ namespace OpenSim.Region.DataSnapshot
392 { 392 {
393 m_log.Warn("[DATASNAPSHOT]: Ignoring unknown exception " + e.ToString()); 393 m_log.Warn("[DATASNAPSHOT]: Ignoring unknown exception " + e.ToString());
394 } 394 }
395 }
396 395
397 byte[] response = new byte[1024]; 396 byte[] response = new byte[1024];
398 // int n = 0; 397 // int n = 0;
399 try 398 try
400 { 399 {
401 // n = reply.Read(response, 0, 1024); 400 // n = reply.Read(response, 0, 1024);
402 reply.Read(response, 0, 1024); 401 reply.Read(response, 0, 1024);
403 } 402 }
404 catch (Exception e) 403 catch (Exception e)
405 { 404 {
406 m_log.WarnFormat("[DATASNAPSHOT]: Unable to decode reply from data service. Ignoring. {0}", e.StackTrace); 405 m_log.WarnFormat("[DATASNAPSHOT]: Unable to decode reply from data service. Ignoring. {0}", e.StackTrace);
406 }
407 // This is not quite working, so...
408 // string responseStr = Util.UTF8.GetString(response);
409 m_log.Info("[DATASNAPSHOT]: data service " + url + " notified. Secret: " + m_Secret);
407 } 410 }
408 // This is not quite working, so...
409 // string responseStr = Util.UTF8.GetString(response);
410 m_log.Info("[DATASNAPSHOT]: data service " + url + " notified. Secret: " + m_Secret);
411 } 411 }
412 412
413 } 413 }