From 6993a26ba599ae38dc6f66332980657d5621987a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 15 Jun 2012 00:40:12 +0100
Subject: Get rid of some unnecessary null checks in
 RegionApplicationBase.StartupSpecific() - a constructor can never return
 null.

Also adds some method doc to MainServer
---
 OpenSim/Region/ClientStack/RegionApplicationBase.cs | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Region/ClientStack/RegionApplicationBase.cs')

diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 6e78d6d..27a5879 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -99,17 +99,13 @@ namespace OpenSim.Region.ClientStack
             // "OOB" Server
             if (m_networkServersInfo.ssl_listener)
             {
-                BaseHttpServer server = null;
-                server = new BaseHttpServer(
+                BaseHttpServer server = new BaseHttpServer(
                     m_networkServersInfo.https_port, m_networkServersInfo.ssl_listener, m_networkServersInfo.cert_path,
                     m_networkServersInfo.cert_pass);
-                // Add the server to m_Servers
-                if(server != null)
-                {
-                    m_log.InfoFormat("[REGION SERVER]: Starting HTTPS server on port {0}", server.Port);
-                    MainServer.AddHttpServer(server);
-                    server.Start();
-                }
+
+                m_log.InfoFormat("[REGION SERVER]: Starting HTTPS server on port {0}", server.Port);
+                MainServer.AddHttpServer(server);
+                server.Start();
             }
             
             base.StartupSpecific();
-- 
cgit v1.1