From 7ba4d9192d877900b64ead9d3dd0cc592d438ca9 Mon Sep 17 00:00:00 2001 From: BlubbFish Date: Sun, 17 Dec 2017 20:00:13 +0000 Subject: [PATCH] [BF] Catch Exception on shutdown --- .../bin/Release/ConnectorDataMosquitto.dll | Bin 8192 -> 8192 bytes .../Data/Mosquitto/bin/Release/Utils-IoT.dll | Bin 14336 -> 14336 bytes IoT/Connector/Data/Mqtt/Mqtt.cs | 9 +++++---- .../Mqtt/bin/Release/ConnectorDataMqtt.dll | Bin 6656 -> 6656 bytes .../Data/Mqtt/bin/Release/Utils-IoT.dll | Bin 14336 -> 14336 bytes IoT/bin/Release/Utils-IoT.dll | Bin 14336 -> 14336 bytes Utils/bin/Release/Utils.dll | Bin 24576 -> 24576 bytes 7 files changed, 5 insertions(+), 4 deletions(-) diff --git a/IoT/Connector/Data/Mosquitto/bin/Release/ConnectorDataMosquitto.dll b/IoT/Connector/Data/Mosquitto/bin/Release/ConnectorDataMosquitto.dll index 6d022e4a5610ce318736b428afdf84ad075d81e2..47014ff3466503638018581c03b204551b482b3f 100644 GIT binary patch delta 66 zcmZp0XmFU&!OVZgY-9IUQ337Bb6+d{v;5|%B~RNRXWPFyK#Ye8Bs)1?LQ;USYNt%; V%TWKuJtE&^nRw4_?vSWp2LM-j7}Nj& delta 66 zcmZp0XmFU&!TjL5_Qvk5q5`I`^}6GacDn9;XepCpeK%oqfEW)GNOp3(grvaEiJT6M V;`{x3#Ors&pHQ2>xkI9Y9RR4}8pZ$s diff --git a/IoT/Connector/Data/Mosquitto/bin/Release/Utils-IoT.dll b/IoT/Connector/Data/Mosquitto/bin/Release/Utils-IoT.dll index cd3c0b9353b989faecc5799ca93a8cc4a542a783..a793bb78d47ca64bf5f6993568f70090e9b4b9d1 100644 GIT binary patch delta 66 zcmZoDXegM_!OVZgY-6{oj)2(4iXUbNl|6fnC(Lfw{C;Bd0i7CVknCi814#iLk)q4R VN9OxO^_Qq~i9f7G+lMYS#s_3xn6|YX6(9|WH59rh|gJdV$8%PRFmyFCf Wws@<<@`PDOmYYx6xH-dM20H-h86B_y diff --git a/IoT/Connector/Data/Mqtt/Mqtt.cs b/IoT/Connector/Data/Mqtt/Mqtt.cs index 35b8205..1a21429 100644 --- a/IoT/Connector/Data/Mqtt/Mqtt.cs +++ b/IoT/Connector/Data/Mqtt/Mqtt.cs @@ -42,10 +42,11 @@ namespace BlubbFish.Utils.IoT.Connector.Data { protected virtual void Dispose(Boolean disposing) { if(!this.disposedValue) { - if(disposing) { - this.client.MqttMsgPublishReceived -= this.Client_MqttMsgPublishReceived; - this.client.Unsubscribe(new String[] { "#" }); - this.client.Disconnect(); + if(disposing) {try { + this.client.MqttMsgPublishReceived -= this.Client_MqttMsgPublishReceived; + this.client.Unsubscribe(new String[] { "#" }); + this.client.Disconnect(); + } catch (Exception) { } } this.client = null; diff --git a/IoT/Connector/Data/Mqtt/bin/Release/ConnectorDataMqtt.dll b/IoT/Connector/Data/Mqtt/bin/Release/ConnectorDataMqtt.dll index 875955e12a46ad20fb05231372fbdcb8f8e2db76..c1af3eaf6951fbf7bdede0f6d1441d45cbdb4c17 100644 GIT binary patch delta 1029 zcmYk5TWnNC7{~wLnKS3W?z($+Dci1X(_NNcz?HJLYT8(11wxAtY`fWFF->Ts>L$|C zTY9s%^g)}t(d{GzgT@q%0tt!9Dqdm}HJkdN4-|nwLNFR$^uel$3Gjm7ob-V?IluYO zH~(+GIhUDhoNIjdEfM(nsr*tUy^=qF#9xvG4ujisz*iz4+vYn4_;`G)9;i?;BcZyf zmR?u$G#hDSvuJ2?zNEyo%i1Mg9JQM*=o-NJA)IVaNw0y6`OFEC6 zF=YbgaN!=c5n#2X+CT8e@vsF|eEUZBcU@M#;1e7^TxXb2rG*>v-{OI|P>@ zRWy$`y~uO%8Qu-|e@oWsk)dq=tHav*xd(`HAJ3$5m9@@~AI!Ax=l+iBm5>#hX4|{l%ew>o$q=mOh zuVP~a7XE|R^rKl`B5!bbUEkmkns$9IdFItV|$f-r^5*I;LIo7+3Xny>nxS9u?8Zg}vAk zSN(RKo#eMg*rPtMt7cOsA&3;0i7-9b#dMH#+2pd-WxLA`m)$OVncI3Ln2!7KyF9=&X3ZDy8%|IsR(RrwO9%H@XIY=Y0KUe*7{wxf z6q6homorQsEg(oGSi<+%L3!4f#VOXuF^LGJ%=hsg4$)bT*U1a)zau_lUgFhO5T-Ag zbNtC-lo0BhE#Fa5O>J%RF7aCds?h`#R=3ug^1%4ZeJ2aQKC(vYqd?60_C~kw!wuiQ zkMq~BX085J8<8`p~`H-~FF+&zW=Q&fMJr+qX-AY#C6B;aQoiSI&_uhpoKyBR=5pNXCF)&Z)7Cw2;6yE0NRMH9%XwSuI*Ek83%_ z|HsD)0s9iAoj4-4l(pjRFtw7=VJ5LhzSH)W)w2=o1jcxt7ObPKM-H|eIBHfHwgY~i zgN;!jDjM8FnvSoE$vbpNb74%Xdbq2D?NKsWpm>-r<)&)K zAJnlvAX1qPl&Y;qG4INWesM+U=qK|jHnc*=52R{Ngv1N>oZ?6wXHlW*AolAxO0&GW zjkBUy#(UTCMm7Boi^tWMy0D{0)X7J>Z~il}0_!-@>=)&X-sp;GANj~H1^7+SgBDq9 zD={W=O=|+BTqG6WbLAOZfi0iUgs@oNv*mO}G=duuuHs|bQOGn9wpeCyoyA&<4HkD; z+{0XegO-k4JYlidDt4WewX?Kp3eC5h9e6K&R+W+K3-B@h)?dZi_ z59M!HzS!sCE(?qm>2Xio-KN>d-6Z@9WoHUMk>`Yr8(DN(4j7r#o4jU}Q<$&MPP2f* zBb)z(NxmtQZeVM)Dmv5fDc&1cyXEZ9!C3i(?I|y#I_dVPG~fI0@|dZ`GLV)5Geq!?hof>A49c~7fq@})bFRT;b^r)`8)yIk delta 70 zcmZoDXegM_!Q63Pd1JSl4*#j?4XXXSowu#oGP6tK?19Y(bZVGEl9TNXBtO^_Qq~i9f7G+lMYS#s_3xn6|YX6(9|WH59rh|gJdV$8%PRFmyFCf Wws@<<@`PDOmYYx6xH-dM20H-h86B_y diff --git a/Utils/bin/Release/Utils.dll b/Utils/bin/Release/Utils.dll index 1a507dbe13fe1ab0fbba361c1d6384da6702a307..b3e9849f54106b4eaa2cb8b2b1af5acfab743601 100644 GIT binary patch delta 88 zcmZoTz}RqraY6?({~5E5-KG8lT8z`Twawh>-m{vSJ92~I?9BoJ3)pplvQZ2`zy!oH oj0_AXN`W|>fgvc^CHU2?#JmFgV-EY~zPol0YSqyQh=Qj%kEMV6G%0@8&0TU3* pFfuTlC