From 5e6954dfe61a883c45c499a511f4843d3e96dca6 Mon Sep 17 00:00:00 2001
From: Homer Horwitz
Date: Sat, 25 Oct 2008 13:45:26 +0000
Subject: 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.

---
 OpenSim/Framework/Servers/BaseHttpServer.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenSim')

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
                     if (m_rpcHandlers.TryGetValue(methodName, out method))
                     {
                         xmlRpcResponse = method(xmlRprcRequest);
+                        // if the method wasn't found, we can't determine KeepAlive state anyway, so lets do it only here
+                        response.KeepAlive = m_rpcHandlersKeepAlive[methodName];
                     }
                     else
                     {
@@ -596,7 +598,6 @@ namespace OpenSim.Framework.Servers
                     }
 
                     responseString = XmlRpcResponseSerializer.Singleton.Serialize(xmlRpcResponse);
-                    response.KeepAlive = m_rpcHandlersKeepAlive[methodName];
                 }
                 else
                 {
-- 
cgit v1.1