From: xb.teng <xb.teng@samsung.com>
Date: Fri, 15 Dec 2017 07:07:01 +0000 (+0800)
Subject: [4.0] Fix TriggerEvent::Triggered callback null-reference issue
X-Git-Tag: 4.0.1-preview1-00044~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f0104c2481fa3c930033be40ab396fc8d9fca620;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git

[4.0] Fix TriggerEvent::Triggered callback null-reference issue

Change-Id: I715503d59efd11dc20d798013714dc669537df96
---

diff --git a/src/Tizen.NUI/src/internal/DisposeQueue.cs b/src/Tizen.NUI/src/internal/DisposeQueue.cs
index 1fb4e69..dc75e9c 100755
--- a/src/Tizen.NUI/src/internal/DisposeQueue.cs
+++ b/src/Tizen.NUI/src/internal/DisposeQueue.cs
@@ -19,7 +19,7 @@ namespace Tizen.NUI
         private List<IDisposable> _disposables = new List<IDisposable>();
         private System.Object _listLock = new object();
         private EventThreadCallback _eventThreadCallback;
-        private static EventThreadCallback.CallbackDelegate _disposeQueueProcessDisposablesDelegate;
+        private EventThreadCallback.CallbackDelegate _disposeQueueProcessDisposablesDelegate;
 
         private DisposeQueue()
         {
@@ -69,14 +69,5 @@ namespace Tizen.NUI
                 _disposables.Clear();
             }
         }
-
-        internal int CurruntAccumulatedDisposableObjects
-        {
-            get
-            {
-                return _disposables.Count;
-            }
-        }
-
     }
 }
diff --git a/src/Tizen.NUI/src/internal/EventThreadCallback.cs b/src/Tizen.NUI/src/internal/EventThreadCallback.cs
index 3c1a2d6..55b9175 100755
--- a/src/Tizen.NUI/src/internal/EventThreadCallback.cs
+++ b/src/Tizen.NUI/src/internal/EventThreadCallback.cs
@@ -24,7 +24,6 @@ namespace Tizen.NUI
         protected bool swigCMemOwn;
         /// <since_tizen> 3 </since_tizen>
         public delegate void CallbackDelegate();
-        private const int THREASHOLD = 100;
 
         internal EventThreadCallback(global::System.IntPtr cPtr, bool cMemoryOwn)
         {
@@ -113,10 +112,7 @@ namespace Tizen.NUI
         {
             if ((System.IntPtr)swigCPtr != global::System.IntPtr.Zero)
             {
-                if(DisposeQueue.Instance.CurruntAccumulatedDisposableObjects > THREASHOLD)
-                {
-                    NDalicManualPINVOKE.EventThreadCallback_Trigger(swigCPtr);
-                }
+                NDalicManualPINVOKE.EventThreadCallback_Trigger(swigCPtr);
             }
 
             if (NDalicPINVOKE.SWIGPendingException.Pending)