Connector. Send original connection error.

mikasoukhov · mikasoukhov · commit c3d3fde84736 · 2018-04-10T21:19:08.000+03:00
diff --git a/Algo/Connector_ProcessMessage.cs b/Algo/Connector_ProcessMessage.cs
@@ -915,7 +915,7 @@ private void ProcessConnectMessage(BaseConnectionMessage message)
 								SetAdapterFailed(adapter, message, ConnectionStates.Connecting, true);
 						}
 						else
-							SetAdapterFailed(adapter, message, ConnectionStates.Connecting, false, new InvalidOperationException(LocalizedStrings.Str683, message.Error));
+							SetAdapterFailed(adapter, message, ConnectionStates.Connecting, false);
 
 						return;
 					}
@@ -939,7 +939,7 @@ private void ProcessConnectMessage(BaseConnectionMessage message)
 								SetAdapterFailed(adapter, message, ConnectionStates.Disconnecting, false);
 						}
 						else
-							SetAdapterFailed(adapter, message, ConnectionStates.Disconnecting, false, new InvalidOperationException(LocalizedStrings.Str684, message.Error));
+							SetAdapterFailed(adapter, message, ConnectionStates.Disconnecting, false);
 
 						return;
 					}
@@ -1088,11 +1088,11 @@ private void RaiseConnectedWhenAllConnected()
 				RaiseConnected();
 		}
 
-		private void SetAdapterFailed(IMessageAdapter adapter, BaseConnectionMessage message, ConnectionStates checkState, bool raiseTimeOut, Exception error = null)
+		private void SetAdapterFailed(IMessageAdapter adapter, BaseConnectionMessage message, ConnectionStates checkState, bool raiseTimeOut)
 		{
 			_adapterStates[adapter] = ConnectionStates.Failed;
 
-			error = error ?? message.Error;
+			var error = message.Error ?? new InvalidOperationException(message is ConnectMessage ? LocalizedStrings.Str683 : LocalizedStrings.Str684);
 
 			// raise ConnectionError only one time
 			if (ConnectionState == checkState)

Original file line number	Diff line number	Diff line change
`@@ -915,7 +915,7 @@ private void ProcessConnectMessage(BaseConnectionMessage message)`
`915`	`915`	`SetAdapterFailed(adapter, message, ConnectionStates.Connecting, true);`
`916`	`916`	`}`
`917`	`917`	`else`
`918`		`- SetAdapterFailed(adapter, message, ConnectionStates.Connecting, false, new InvalidOperationException(LocalizedStrings.Str683, message.Error));`
	`918`	`+ SetAdapterFailed(adapter, message, ConnectionStates.Connecting, false);`
`919`	`919`
`920`	`920`	`return;`
`921`	`921`	`}`
`@@ -939,7 +939,7 @@ private void ProcessConnectMessage(BaseConnectionMessage message)`
`939`	`939`	`SetAdapterFailed(adapter, message, ConnectionStates.Disconnecting, false);`
`940`	`940`	`}`
`941`	`941`	`else`
`942`		`- SetAdapterFailed(adapter, message, ConnectionStates.Disconnecting, false, new InvalidOperationException(LocalizedStrings.Str684, message.Error));`
	`942`	`+ SetAdapterFailed(adapter, message, ConnectionStates.Disconnecting, false);`
`943`	`943`
`944`	`944`	`return;`
`945`	`945`	`}`
`@@ -1088,11 +1088,11 @@ private void RaiseConnectedWhenAllConnected()`
`1088`	`1088`	`RaiseConnected();`
`1089`	`1089`	`}`
`1090`	`1090`
`1091`		`- private void SetAdapterFailed(IMessageAdapter adapter, BaseConnectionMessage message, ConnectionStates checkState, bool raiseTimeOut, Exception error = null)`
	`1091`	`+ private void SetAdapterFailed(IMessageAdapter adapter, BaseConnectionMessage message, ConnectionStates checkState, bool raiseTimeOut)`
`1092`	`1092`	`{`
`1093`	`1093`	`_adapterStates[adapter] = ConnectionStates.Failed;`
`1094`	`1094`
`1095`		`- error = error ?? message.Error;`
	`1095`	`+ var error = message.Error ?? new InvalidOperationException(message is ConnectMessage ? LocalizedStrings.Str683 : LocalizedStrings.Str684);`
`1096`	`1096`
`1097`	`1097`	`// raise ConnectionError only one time`
`1098`	`1098`	`if (ConnectionState == checkState)`