aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorHomer Horwitz2008-10-25 13:45:26 +0000
committerHomer Horwitz2008-10-25 13:45:26 +0000
commit5e6954dfe61a883c45c499a511f4843d3e96dca6 (patch)
tree322970b61b7647851a71ad2cf8d6b8dfeb39fd39
parentMake ScenePresence.Close public to allow subclassing of SceneComms (diff)
downloadopensim-SC-5e6954dfe61a883c45c499a511f4843d3e96dca6.zip
opensim-SC-5e6954dfe61a883c45c499a511f4843d3e96dca6.tar.gz
opensim-SC-5e6954dfe61a883c45c499a511f4843d3e96dca6.tar.bz2
opensim-SC-5e6954dfe61a883c45c499a511f4843d3e96dca6.tar.xz
Fixed the cause of a hidden Exception which prevented BaseHttpServer to answer
when a non-existing XmlRpc method was called. Now, it will correctly respond with a faultCode/faultMessage.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 3d125fb..871ea57 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -587,6 +587,8 @@ namespace OpenSim.Framework.Servers
587 if (m_rpcHandlers.TryGetValue(methodName, out method)) 587 if (m_rpcHandlers.TryGetValue(methodName, out method))
588 { 588 {
589 xmlRpcResponse = method(xmlRprcRequest); 589 xmlRpcResponse = method(xmlRprcRequest);
590 // if the method wasn't found, we can't determine KeepAlive state anyway, so lets do it only here
591 response.KeepAlive = m_rpcHandlersKeepAlive[methodName];
590 } 592 }
591 else 593 else
592 { 594 {
@@ -596,7 +598,6 @@ namespace OpenSim.Framework.Servers
596 } 598 }
597 599
598 responseString = XmlRpcResponseSerializer.Singleton.Serialize(xmlRpcResponse); 600 responseString = XmlRpcResponseSerializer.Singleton.Serialize(xmlRpcResponse);
599 response.KeepAlive = m_rpcHandlersKeepAlive[methodName];
600 } 601 }
601 else 602 else
602 { 603 {