X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2FTizen.Network.WiFi%2FTizen.Network.WiFi%2FWiFiNetworkChange.cs;h=4c39c98d53d30ac93d121c000b6cc27add169d56;hb=b46ce4d978837a26ec00ad9b04048cb2b5b42857;hp=122c9050b8ed2883fa6d9b4c664323848e97ff9e;hpb=fd9f96e3df679a9af8de11d8b227dfa33ff4cf80;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git

diff --git a/src/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiNetworkChange.cs b/src/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiNetworkChange.cs
index 122c905..4c39c98 100755
--- a/src/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiNetworkChange.cs
+++ b/src/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiNetworkChange.cs
@@ -62,7 +62,14 @@ namespace Tizen.Network.WiFi
                 {
                     if (_deviceStateChanged == null)
                     {
-                        RegisterDeviceStateChangedEvent(); 
+                        try
+                        {
+                            RegisterDeviceStateChangedEvent();
+                        } catch (Exception e)
+                        {
+                            Log.Error(Globals.LogTag, "Exception on adding DeviceStateChanged\n" + e.ToString());
+                            return;
+                        }
                     }
                     _deviceStateChanged += value;
                 }, null);
@@ -74,7 +81,14 @@ namespace Tizen.Network.WiFi
                     _deviceStateChanged -= value;
                     if (_deviceStateChanged == null)
                     {
-                        UnregisterDeviceStateChangedEvent();
+                        try
+                        {
+                            UnregisterDeviceStateChangedEvent();
+                        }
+                        catch (Exception e)
+                        {
+                            Log.Error(Globals.LogTag, "Exception on removing DeviceStateChanged\n" + e.ToString());
+                        }
                     }
                 }, null);
             }
@@ -88,7 +102,15 @@ namespace Tizen.Network.WiFi
                 {
                     if (_connectionStateChanged == null)
                     {
-                        RegisterConnectionStateChangedEvent();
+                        try
+                        {
+                            RegisterConnectionStateChangedEvent();
+                        }
+                        catch (Exception e)
+                        {
+                            Log.Error(Globals.LogTag, "Exception on adding ConnectionStateChanged\n" + e.ToString());
+                            return;
+                        }
                     }
                     _connectionStateChanged += value;
                 }, null);
@@ -100,7 +122,14 @@ namespace Tizen.Network.WiFi
                     _connectionStateChanged -= value;
                     if (_connectionStateChanged == null)
                     {
-                        UnregisterConnectionStateChangedEvent();
+                        try
+                        {
+                            UnregisterConnectionStateChangedEvent();
+                        }
+                        catch (Exception e)
+                        {
+                            Log.Error(Globals.LogTag, "Exception on removing ConnectionStateChanged\n" + e.ToString());
+                        }
                     }
                 }, null);
             }
@@ -114,7 +143,15 @@ namespace Tizen.Network.WiFi
                 {
                     if (_rssiLevelChanged == null)
                     {
-                        RegisterRssiLevelChangedEvent();
+                        try
+                        {
+                            RegisterRssiLevelChangedEvent();
+                        }
+                        catch (Exception e)
+                        {
+                            Log.Error(Globals.LogTag, "Exception on adding RssiLevelChanged\n" + e.ToString());
+                            return;
+                        }
                     }
                     _rssiLevelChanged += value;
                 }, null);
@@ -126,7 +163,14 @@ namespace Tizen.Network.WiFi
                     _rssiLevelChanged -= value;
                     if (_rssiLevelChanged == null)
                     {
-                        UnregisterRssiLevelChangedEvent();
+                        try
+                        {
+                            UnregisterRssiLevelChangedEvent();
+                        }
+                        catch (Exception e)
+                        {
+                            Log.Error(Globals.LogTag, "Exception on removing RssiLevelChanged\n" + e.ToString());
+                        }
                     }
                 }, null);
             }
@@ -140,7 +184,15 @@ namespace Tizen.Network.WiFi
                 {
                     if (_backgroundScanFinished == null)
                     {
-                        RegisterBackgroundScanFinishedEvent();
+                        try
+                        {
+                            RegisterBackgroundScanFinishedEvent();
+                        }
+                        catch (Exception e)
+                        {
+                            Log.Error(Globals.LogTag, "Exception on adding BackgroundScanFinished\n" + e.ToString());
+                            return;
+                        }
                     }
                     _backgroundScanFinished += value;
                 }, null);
@@ -152,7 +204,14 @@ namespace Tizen.Network.WiFi
                     _backgroundScanFinished -= value;
                     if (_backgroundScanFinished == null)
                     {
-                        UnregisterBackgroundScanFinishedEvent();
+                        try
+                        {
+                            UnregisterBackgroundScanFinishedEvent();
+                        }
+                        catch (Exception e)
+                        {
+                            Log.Error(Globals.LogTag, "Exception on removing BackgroundScanFinished\n" + e.ToString());
+                        }
                     }
                 }, null);
             }