2 files changed, 8 insertions, 14 deletions

diff --git a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
index 19c03a8..edcd134 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
@@ -101,20 +101,11 @@ namespace OpenSim.Framework.Servers.HttpServer
             using (WebResponse resp = request.GetResponse())
             {
                 XmlSerializer deserializer = new XmlSerializer(typeof(TResponse));
-                Stream respStream = null;
-                try
-                {
-                    respStream = resp.GetResponseStream();
+
+                using (Stream respStream = resp.GetResponseStream())
                     deserial = (TResponse)deserializer.Deserialize(respStream);
-                }
-                catch { }
-                finally
-                {
-                    if (respStream != null)
-                        respStream.Close();
-                    resp.Close();
-                }
             }
+
             return deserial;
         }
     }
diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs
index 293887f..cfd34bb 100644
--- a/OpenSim/Framework/Servers/MainServer.cs
+++ b/OpenSim/Framework/Servers/MainServer.cs
@@ -227,9 +227,12 @@ namespace OpenSim.Framework.Servers
                         handlers.AppendFormat("\t{0}\n", s);
         
                     handlers.AppendFormat("* HTTP:\n");
-                    List<String> poll = httpServer.GetPollServiceHandlerKeys();
                     foreach (String s in httpServer.GetHTTPHandlerKeys())
-                        handlers.AppendFormat("\t{0} {1}\n", s, (poll.Contains(s) ? "(poll service)" : string.Empty));
+                        handlers.AppendFormat("\t{0}\n", s);
+
+                    handlers.AppendFormat("* HTTP (poll):\n");
+                    foreach (String s in httpServer.GetPollServiceHandlerKeys())
+                        handlers.AppendFormat("\t{0}\n", s);
                     
                     handlers.AppendFormat("* JSONRPC:\n");
                     foreach (String s in httpServer.GetJsonRpcHandlerKeys())