diff options
author | teravus | 2013-02-14 18:52:11 -0500 |
---|---|---|
committer | teravus | 2013-02-14 18:52:11 -0500 |
commit | 71862f34b6e97e19fceefd9ccb813ce09ef0a0c3 (patch) | |
tree | eab3647d4549f9bb863d6a3be32e97b41f798cb8 /OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs | |
parent | * gracefully handle a Situation where a double close is called on the WebSock... (diff) | |
download | opensim-SC-71862f34b6e97e19fceefd9ccb813ce09ef0a0c3.zip opensim-SC-71862f34b6e97e19fceefd9ccb813ce09ef0a0c3.tar.gz opensim-SC-71862f34b6e97e19fceefd9ccb813ce09ef0a0c3.tar.bz2 opensim-SC-71862f34b6e97e19fceefd9ccb813ce09ef0a0c3.tar.xz |
* Handle null check on configs in module startup so that the the code can be run on 'stop on handled and unhandled null reference exceptions' mode without pausing during startup a bunch of times. I don't think exceptions were really meant for replacing a single if statement...
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs index 385f5ad..cbffca7 100644 --- a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs | |||
@@ -111,13 +111,15 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC | |||
111 | m_rpcPending = new Dictionary<UUID, RPCRequestInfo>(); | 111 | m_rpcPending = new Dictionary<UUID, RPCRequestInfo>(); |
112 | m_rpcPendingResponses = new Dictionary<UUID, RPCRequestInfo>(); | 112 | m_rpcPendingResponses = new Dictionary<UUID, RPCRequestInfo>(); |
113 | m_pendingSRDResponses = new Dictionary<UUID, SendRemoteDataRequest>(); | 113 | m_pendingSRDResponses = new Dictionary<UUID, SendRemoteDataRequest>(); |
114 | 114 | if (config.Configs["XMLRPC"] != null) | |
115 | try | ||
116 | { | ||
117 | m_remoteDataPort = config.Configs["XMLRPC"].GetInt("XmlRpcPort", m_remoteDataPort); | ||
118 | } | ||
119 | catch (Exception) | ||
120 | { | 115 | { |
116 | try | ||
117 | { | ||
118 | m_remoteDataPort = config.Configs["XMLRPC"].GetInt("XmlRpcPort", m_remoteDataPort); | ||
119 | } | ||
120 | catch (Exception) | ||
121 | { | ||
122 | } | ||
121 | } | 123 | } |
122 | } | 124 | } |
123 | 125 | ||