Skip to content

Commit 226e043

Browse files
committed
Fixing Fleck issues
1 parent 8170c7c commit 226e043

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

src/net45/Default/WampSharp.Fleck/Fleck/FleckPinger.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ public Task SendPing(byte[] message)
2222

2323
public event Action<IList<byte>> OnPong
2424
{
25-
add => mConnection.OnPong += value;
26-
remove => mConnection.OnPong -= value;
25+
add => mConnection.OnPong += new Action<byte[]>(value);
26+
remove => mConnection.OnPong -= new Action<byte[]>(value);
2727
}
2828

2929
public bool IsConnected => mConnection.IsAvailable;

src/net45/Default/WampSharp.Fleck/Fleck/FleckWebSocketTransport.cs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,24 @@ private void RouteLogs()
8585
Action<LogLevel, string, Exception> logAction = FleckLog.LogAction;
8686

8787
if (logAction != null &&
88-
logAction.Method.DeclaringType == typeof (FleckLog))
88+
GetMethodDeclaringType(logAction) == typeof (FleckLog))
8989
{
9090
FleckLog.LogAction = ConvertLog;
9191
}
9292
}
9393

94+
private static Type GetMethodDeclaringType(Action<LogLevel, string, Exception> logAction)
95+
{
96+
Type methodDeclaringType = logAction.Method.DeclaringType;
97+
98+
while (methodDeclaringType.IsNested)
99+
{
100+
methodDeclaringType = methodDeclaringType.DeclaringType;
101+
}
102+
103+
return methodDeclaringType;
104+
}
105+
94106
private void ConvertLog(LogLevel logLevel, string message, Exception exception)
95107
{
96108
switch (logLevel)

0 commit comments

Comments
 (0)