From 6af171ddcb4f52c36117f1ffe8536a65567dfdcd Mon Sep 17 00:00:00 2001
From: sta <sta.blockhead@gmail.com>
Date: Mon, 5 Jan 2015 16:37:14 +0900
Subject: [PATCH] Refactored a few for EndPointListener.cs

---
 websocket-sharp/Net/EndPointListener.cs | 28 +++++++++++++++----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/websocket-sharp/Net/EndPointListener.cs b/websocket-sharp/Net/EndPointListener.cs
index f79ae177..978a1537 100644
--- a/websocket-sharp/Net/EndPointListener.cs
+++ b/websocket-sharp/Net/EndPointListener.cs
@@ -451,14 +451,16 @@ namespace WebSocketSharp.Net
       if (prefix.Host == "*") {
         do {
           current = _unhandled;
-          future = current != null
-                   ? new List<HttpListenerPrefix> (current)
-                   : new List<HttpListenerPrefix> ();
+          if (current == null)
+            break;
 
+          future = new List<HttpListenerPrefix> (current);
           if (!removeSpecial (future, prefix))
-            break; // Prefix not found.
+            break; // The prefix wasn't found.
         }
-        while (Interlocked.CompareExchange (ref _unhandled, future, current) != current);
+        while (
+          Interlocked.CompareExchange<List<HttpListenerPrefix>> (
+            ref _unhandled, future, current) != current);
 
         checkIfRemove ();
         return;
@@ -467,14 +469,16 @@ namespace WebSocketSharp.Net
       if (prefix.Host == "+") {
         do {
           current = _all;
-          future = current != null
-                   ? new List<HttpListenerPrefix> (current)
-                   : new List<HttpListenerPrefix> ();
+          if (current == null)
+            break;
 
+          future = new List<HttpListenerPrefix> (current);
           if (!removeSpecial (future, prefix))
-            break; // Prefix not found.
+            break; // The prefix wasn't found.
         }
-        while (Interlocked.CompareExchange (ref _all, future, current) != current);
+        while (
+          Interlocked.CompareExchange<List<HttpListenerPrefix>> (
+            ref _all, future, current) != current);
 
         checkIfRemove ();
         return;
@@ -489,7 +493,9 @@ namespace WebSocketSharp.Net
         prefs2 = new Dictionary<HttpListenerPrefix, HttpListener> (prefs);
         prefs2.Remove (prefix);
       }
-      while (Interlocked.CompareExchange (ref _prefixes, prefs2, prefs) != prefs);
+      while (
+        Interlocked.CompareExchange<Dictionary<HttpListenerPrefix, HttpListener>> (
+          ref _prefixes, prefs2, prefs) != prefs);
 
       checkIfRemove ();
     }