aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSean Dague2009-07-20 15:12:50 +0000
committerSean Dague2009-07-20 15:12:50 +0000
commit57c325540c33af1c46d2af13c326548ead5878e9 (patch)
treeb0e234c0e099d39c300ad03c4d8c3154a5fc3713
parent* Remove a noisy debug console message that was used for testing the camera c... (diff)
downloadopensim-SC_OLD-57c325540c33af1c46d2af13c326548ead5878e9.zip
opensim-SC_OLD-57c325540c33af1c46d2af13c326548ead5878e9.tar.gz
opensim-SC_OLD-57c325540c33af1c46d2af13c326548ead5878e9.tar.bz2
opensim-SC_OLD-57c325540c33af1c46d2af13c326548ead5878e9.tar.xz
From: Rick Alther <alther@us.ibm.com>
This patch fixes a problem in the RestXmlWriter where an exception may be thrown when ToString() is called. ToString() is closing the last tag prior to returning the string object, which it shouldn't do. People should be closing the XML tags and document properly and not rely on the ToString() side effect to do it for them. This is most noticeable if you hit the /regions/ and /regioninfo/ REST calls. If you are running r9579 or later, these calls will result in an error.
-rw-r--r--OpenSim/ApplicationPlugins/Rest/RestXmlWriter.cs1
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/RestXmlWriter.cs b/OpenSim/ApplicationPlugins/Rest/RestXmlWriter.cs
index f27fd64..9abb0c8 100644
--- a/OpenSim/ApplicationPlugins/Rest/RestXmlWriter.cs
+++ b/OpenSim/ApplicationPlugins/Rest/RestXmlWriter.cs
@@ -63,7 +63,6 @@ namespace OpenSim.ApplicationPlugins.Rest
63 63
64 public override string ToString() 64 public override string ToString()
65 { 65 {
66 WriteEndElement();
67 Flush(); 66 Flush();
68 Close(); 67 Close();
69 return m_sw.ToString(); 68 return m_sw.ToString();