Switched generic messages to Protobuf-net.

1 files changed, 5 insertions, 6 deletions

diff --git a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs
index 7ebe32927..58df06fd8 100644
--- a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs
+++ b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs
@@ -421,16 +421,15 @@ namespace Tango.Integration.ExternalBridge
                         }
                         else //Handle GenericRequest with inner JSON formated generic message.
                         {
-                            var genericType = (message as GenericRequest).Type;
+                            var genericType = Type.GetType((message as GenericRequest).Type);
 
                             try
                             {
-                                if (_requestHandlers.ContainsKey(genericType))
+                                if (_requestHandlers.ContainsKey(genericType.Name))
                                 {
-                                    var json = (message as GenericRequest).Data.ToStringUtf8();
-                                    var innerMessage = JsonConvert.DeserializeObject(json, _genericMessageSettings);
+                                    var innerMessage = ProtoSerializer.DeserializeFromByteString(genericType, (message as GenericRequest).Data);  //JsonConvert.DeserializeObject(json, _genericMessageSettings);
 
-                                    var handler = _requestHandlers[genericType];
+                                    var handler = _requestHandlers[genericType.Name];
                                     handler.Method.Invoke(handler.Handler, new object[]
                                     {
                                         innerMessage,
@@ -441,7 +440,7 @@ namespace Tango.Integration.ExternalBridge
                             }
                             catch (Exception ex)
                             {
-                                LogManager.Log(ex, $"Error invoking external bridge handler for request '{genericType}'.");
+                                LogManager.Log(ex, $"Error invoking external bridge handler for request '{genericType.Name}'.");
                             }
                         }
                     }