diff options
| author | Justin Clark-Casey (justincc) | 2012-06-14 04:29:15 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-06-14 04:29:15 +0100 |
| commit | f4b02f8e39b9e437a5f5ce4ffc307354fa39bd39 (patch) | |
| tree | 359d2b378dcc97c14105d29e02e0c8e1565079ea | |
| parent | Fix very recent regression in 917d753 where I put the ++updatesThisCall outsi... (diff) | |
| download | opensim-SC_OLD-f4b02f8e39b9e437a5f5ce4ffc307354fa39bd39.zip opensim-SC_OLD-f4b02f8e39b9e437a5f5ce4ffc307354fa39bd39.tar.gz opensim-SC_OLD-f4b02f8e39b9e437a5f5ce4ffc307354fa39bd39.tar.bz2 opensim-SC_OLD-f4b02f8e39b9e437a5f5ce4ffc307354fa39bd39.tar.xz | |
Fix a regression in BaseHttpServer.HandleXmlRpcRequests() from recent c6e3752
Accidentally make responseString null by default instead of String.Empty.
It needs to be something in case the XmlRpcRequest deserialize throws an exception due to bad xml (a failure which we silently swallow!)
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index ef6e259..9064464 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -786,7 +786,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 786 | requestStream.Close(); | 786 | requestStream.Close(); |
| 787 | //m_log.Debug(requestBody); | 787 | //m_log.Debug(requestBody); |
| 788 | requestBody = requestBody.Replace("<base64></base64>", ""); | 788 | requestBody = requestBody.Replace("<base64></base64>", ""); |
| 789 | string responseString = null; | 789 | string responseString = String.Empty; |
| 790 | XmlRpcRequest xmlRprcRequest = null; | 790 | XmlRpcRequest xmlRprcRequest = null; |
| 791 | 791 | ||
| 792 | try | 792 | try |