fixed the compiling issues after upgrading to SuperSocket 1.6

kerryjiang · Oct 30, 2013 · 31dd833 · 31dd833
1 parent 6123b38
commit 31dd833
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 39 deletions.
diff --git a/SuperWebSocket/SubProtocol/SubCommandBase.cs b/SuperWebSocket/SubProtocol/SubCommandBase.cs
@@ -43,7 +43,8 @@ void ISubCommand<TWebSocketSession>.ExecuteCommand(TWebSocketSession session, Su
                 return;
             }
 
-            var commandContext = new CommandExecutingContext(session, requestInfo, this);
+            var commandContext = new CommandExecutingContext();
+            commandContext.Initialize(session, requestInfo, this);
 
             for (var i = 0; i < filters.Length; i++)
             {

diff --git a/SuperWebSocket/SubProtocol/SubCommandFilterAttribute.cs b/SuperWebSocket/SubProtocol/SubCommandFilterAttribute.cs
@@ -4,6 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using SuperSocket.SocketBase;
+using SuperSocket.SocketBase.Metadata;
 
 namespace SuperWebSocket.SubProtocol
 {

diff --git a/SuperWebSocket/WebSocketServer.cs b/SuperWebSocket/WebSocketServer.cs
@@ -390,12 +390,12 @@ private void SetupMultipleProtocolSwitch(IProtocolProcessor rootProcessor)
         }
 
         /// <summary>
-        /// Called when [startup].
+        /// Called when [started].
         /// </summary>
-        protected override void OnStartup()
+        protected override void OnStarted()
         {
             m_HandshakePendingQueueCheckingTimer = new Timer(HandshakePendingQueueCheckingCallback, null, m_HandshakePendingQueueCheckingInterval * 1000, m_HandshakePendingQueueCheckingInterval * 1000);
-            base.OnStartup();
+            base.OnStarted();
         }
 
         private void HandshakePendingQueueCheckingCallback(object state)

diff --git a/SuperWebSocket/WebSocketSession.cs b/SuperWebSocket/WebSocketSession.cs
@@ -373,41 +373,6 @@ void IWebSocketSession.SendRawData(byte[] data, int offset, int length)
             base.Send(data, offset, length);
         }
 
-        /// <summary>
-        /// Sends the response.
-        /// </summary>
-        /// <param name="message">The message.</param>
-        /// <returns></returns>
-        [Obsolete("Use 'Send(string message)' instead")]
-        public override void SendResponse(string message)
-        {
-            this.Send(message);
-        }
-
-        /// <summary>
-        /// Sends the response.
-        /// </summary>
-        /// <param name="data">The data.</param>
-        /// <param name="offset">The offset.</param>
-        /// <param name="length">The length.</param>
-        /// <returns></returns>
-        [Obsolete("Use 'Send(byte[] data, int offset, int length)' instead")]
-        public override void SendResponse(byte[] data, int offset, int length)
-        {
-            this.Send(data, offset, length);
-        }
-
-        /// <summary>
-        /// Sends the response.
-        /// </summary>
-        /// <param name="segment">The segment.</param>
-        /// <returns></returns>
-        [Obsolete("Use 'Send(ArraySegment<byte> segment)' instead")]
-        public override void SendResponse(ArraySegment<byte> segment)
-        {
-            this.Send(segment);
-        }
-
         /// <summary>
         /// Closes the with handshake.
         /// </summary>