Fixing issues with changes

darkl · darkl · commit 4a001d3e4edd · 2018-05-29T16:06:00.000-04:00
diff --git a/src/net45/Extensions/WampSharp.AspNet.WebSockets.Server/AspNetWebsocketTransport.cs b/src/net45/Extensions/WampSharp.AspNet.WebSockets.Server/AspNetWebsocketTransport.cs
@@ -116,9 +116,9 @@ private async Task ProcessWebSocket(AspNetWebSocketContext webSocketContext, Htt
         /// <exclude />
         protected override void OpenConnection<TMessage>(WebSocketData original, IWampConnection<TMessage> connection)
         {
-            WebSocketWrapperConnection<TMessage> casted = connection as WebSocketWrapperConnection<TMessage>;
+            IWampWebSocketWrapperConnection casted = connection as IWampWebSocketWrapperConnection;
 
-            Task task = Task.Run((Func<Task>) casted.RunAsync);
+            Task task = Task.Run(casted.RunAsync);
 
             original.ReadTask = task;
         }
diff --git a/src/net45/Extensions/WampSharp.HttpListener/HttpListenerWebSocketTransport.cs b/src/net45/Extensions/WampSharp.HttpListener/HttpListenerWebSocketTransport.cs
@@ -129,9 +129,9 @@ private void OnUnknownRequest(HttpListenerContext context)
         /// <exclude />
         protected override void OpenConnection<TMessage>(WebSocketData original, IWampConnection<TMessage> connection)
         {
-            WebSocketWrapperConnection<TMessage> casted = connection as WebSocketWrapperConnection<TMessage>;
+            IWampWebSocketWrapperConnection casted = connection as IWampWebSocketWrapperConnection;
 
-            Task task = Task.Run((Func<Task>)casted.RunAsync);
+            Task task = Task.Run(casted.RunAsync);
         }
     }
 }
diff --git a/src/net45/Extensions/WampSharp.Owin/Owin/OwinWebSocketTransport.cs b/src/net45/Extensions/WampSharp.Owin/Owin/OwinWebSocketTransport.cs
@@ -35,9 +35,9 @@ public override void Dispose()
 
         protected override void OpenConnection<TMessage>(WebSocketData original, IWampConnection<TMessage> connection)
         {
-            WebSocketWrapperConnection<TMessage> casted = connection as WebSocketWrapperConnection<TMessage>;
+            IWampWebSocketWrapperConnection casted = connection as IWampWebSocketWrapperConnection;
 
-            Task task = Task.Run((Func<Task>) casted.RunAsync);
+            Task task = Task.Run(casted.RunAsync);
 
             original.ReadTask = task;
         }
diff --git a/src/net45/WampSharp.WAMP1.Default/WAMP1/V1/WampChannelFactoryExtensions.cs b/src/net45/WampSharp.WAMP1.Default/WAMP1/V1/WampChannelFactoryExtensions.cs
@@ -23,7 +23,7 @@ public static IWampChannel<JToken> CreateChannel(this DefaultWampChannelFactory
 
         public static IWampChannel<TMessage> CreateChannel<TMessage>(this IWampChannelFactory<TMessage> factory, string address, IWampTextMessageParser<TMessage> parser)
         {
-            return factory.CreateChannel(address, parser, (Action<SecurityOption>)null);
+            return factory.CreateChannel(address, parser, null);
         }
 
         public static IWampChannel<TMessage> CreateChannel<TMessage>(this IWampChannelFactory<TMessage> factory, string address, 

Original file line number	Diff line number	Diff line change
`@@ -116,9 +116,9 @@ private async Task ProcessWebSocket(AspNetWebSocketContext webSocketContext, Htt`
`116`	`116`	`/// <exclude />`
`117`	`117`	`protected override void OpenConnection<TMessage>(WebSocketData original, IWampConnection<TMessage> connection)`
`118`	`118`	`{`
`119`		`- WebSocketWrapperConnection<TMessage> casted = connection as WebSocketWrapperConnection<TMessage>;`
	`119`	`+ IWampWebSocketWrapperConnection casted = connection as IWampWebSocketWrapperConnection;`
`120`	`120`
`121`		`- Task task = Task.Run((Func<Task>) casted.RunAsync);`
	`121`	`+ Task task = Task.Run(casted.RunAsync);`
`122`	`122`
`123`	`123`	`original.ReadTask = task;`
`124`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,9 +129,9 @@ private void OnUnknownRequest(HttpListenerContext context)`
`129`	`129`	`/// <exclude />`
`130`	`130`	`protected override void OpenConnection<TMessage>(WebSocketData original, IWampConnection<TMessage> connection)`
`131`	`131`	`{`
`132`		`- WebSocketWrapperConnection<TMessage> casted = connection as WebSocketWrapperConnection<TMessage>;`
	`132`	`+ IWampWebSocketWrapperConnection casted = connection as IWampWebSocketWrapperConnection;`
`133`	`133`
`134`		`- Task task = Task.Run((Func<Task>)casted.RunAsync);`
	`134`	`+ Task task = Task.Run(casted.RunAsync);`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,9 @@ public override void Dispose()`
`35`	`35`
`36`	`36`	`protected override void OpenConnection<TMessage>(WebSocketData original, IWampConnection<TMessage> connection)`
`37`	`37`	`{`
`38`		`- WebSocketWrapperConnection<TMessage> casted = connection as WebSocketWrapperConnection<TMessage>;`
	`38`	`+ IWampWebSocketWrapperConnection casted = connection as IWampWebSocketWrapperConnection;`
`39`	`39`
`40`		`- Task task = Task.Run((Func<Task>) casted.RunAsync);`
	`40`	`+ Task task = Task.Run(casted.RunAsync);`
`41`	`41`
`42`	`42`	`original.ReadTask = task;`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public static IWampChannel<JToken> CreateChannel(this DefaultWampChannelFactory`
`23`	`23`
`24`	`24`	`public static IWampChannel<TMessage> CreateChannel<TMessage>(this IWampChannelFactory<TMessage> factory, string address, IWampTextMessageParser<TMessage> parser)`
`25`	`25`	`{`
`26`		`- return factory.CreateChannel(address, parser, (Action<SecurityOption>)null);`
	`26`	`+ return factory.CreateChannel(address, parser, null);`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public static IWampChannel<TMessage> CreateChannel<TMessage>(this IWampChannelFactory<TMessage> factory, string address,`