From 89a107ebeabe4e71505eab972bad72c9a63f4e70 Mon Sep 17 00:00:00 2001
From: Seungkeun Lee <sngn.lee@samsung.com>
Date: Thu, 7 Apr 2016 13:59:54 +0900
Subject: [PATCH] Fix ApplicationManagerImpl/MessagePort finalizer

 - If implemented IDisposable interface, finalizer only call Dispose(false)

Change-Id: I849eaafa65c519834994f9418d1b31c71e46f77a
---
 .../Tizen.Applications.Managers/ApplicationManagerImpl.cs    |  3 +--
 .../Tizen.Applications.Messages/MessagePort.cs               | 12 +++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Tizen.Applications/Tizen.Applications.Managers/ApplicationManagerImpl.cs b/Tizen.Applications/Tizen.Applications.Managers/ApplicationManagerImpl.cs
index 3fb98cb..482565a 100755
--- a/Tizen.Applications/Tizen.Applications.Managers/ApplicationManagerImpl.cs
+++ b/Tizen.Applications/Tizen.Applications.Managers/ApplicationManagerImpl.cs
@@ -32,8 +32,6 @@ namespace Tizen.Applications.Managers
 
         ~ApplicationManagerImpl()
         {
-            Log.Debug(LogTag, "~ApplicationManagerImpl()");
-            UnRegisterApplicationChangedEvent();
             Dispose(false);
         }
 
@@ -64,6 +62,7 @@ namespace Tizen.Applications.Managers
                 // Free managed objects.
             }
             //Free unmanaged objects
+            UnRegisterApplicationChangedEvent();
             _disposed = true;
         }
 
diff --git a/Tizen.Applications/Tizen.Applications.Messages/MessagePort.cs b/Tizen.Applications/Tizen.Applications.Messages/MessagePort.cs
index 3d9563b..97c61e3 100755
--- a/Tizen.Applications/Tizen.Applications.Messages/MessagePort.cs
+++ b/Tizen.Applications/Tizen.Applications.Messages/MessagePort.cs
@@ -39,10 +39,6 @@ namespace Tizen.Applications.Messages
 
         ~MessagePort()
         {
-            if (_listening)
-            {
-                StopListening();
-            }
             Dispose(false);
         }
 
@@ -212,7 +208,13 @@ namespace Tizen.Applications.Messages
         {
             if (_listening)
             {
-                StopListening();
+                try
+                {
+                    StopListening();
+                } catch (Exception e)
+                {
+                    Tizen.Log.Warn(GetType().Namespace, "Exception in Dispose :" + e.Message);
+                }
             }
         }
 
-- 
2.7.4