From 51acd3bd4438aa08d3a59d4d853286fef6647d8c Mon Sep 17 00:00:00 2001
From: zhouhao <haozhou.zhou@samsung.com>
Date: Fri, 5 Jan 2024 15:46:33 +0800
Subject: [PATCH] [NUI] Fix some SVACE issues.

---
 src/Tizen.NUI.Components/Controls/Slider.cs          | 10 +++++++++-
 src/Tizen.NUI.Components/Controls/Switch.cs          | 20 ++++++++++++++++++--
 .../src/internal/FrameBroker/FrameBrokerBase.cs      |  6 ++++--
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/Tizen.NUI.Components/Controls/Slider.cs b/src/Tizen.NUI.Components/Controls/Slider.cs
index 5b21df4..b1d3e64 100755
--- a/src/Tizen.NUI.Components/Controls/Slider.cs
+++ b/src/Tizen.NUI.Components/Controls/Slider.cs
@@ -553,7 +553,15 @@ namespace Tizen.NUI.Components
         }
         private StringSelector InternalThumbImageURLSelector
         {
-            get => thumbImage?.ResourceUrlSelector == null ? null : new StringSelector(thumbImage.ResourceUrlSelector);
+            get
+            {
+                Selector<string> resourceUrlSelector = thumbImage?.ResourceUrlSelector;
+                if(resourceUrlSelector != null)
+                {
+                    return new StringSelector(resourceUrlSelector);
+                }
+                return null;
+            }
             set
             {
                 if (value == null || thumbImage == null)
diff --git a/src/Tizen.NUI.Components/Controls/Switch.cs b/src/Tizen.NUI.Components/Controls/Switch.cs
index 5caef32..df04c78 100755
--- a/src/Tizen.NUI.Components/Controls/Switch.cs
+++ b/src/Tizen.NUI.Components/Controls/Switch.cs
@@ -202,7 +202,15 @@ namespace Tizen.NUI.Components
         }
         private StringSelector InternalSwitchBackgroundImageURLSelector
         {
-            get => Icon?.ResourceUrlSelector == null ? null : new StringSelector(Icon.ResourceUrlSelector);
+            get
+            {
+                Selector<string> resourceUrlSelector = Icon?.ResourceUrlSelector;
+                if(resourceUrlSelector != null)
+                {
+                    return new StringSelector(resourceUrlSelector);
+                }
+                return null;
+            }
             set
             {
                 Debug.Assert(Icon != null);
@@ -257,7 +265,15 @@ namespace Tizen.NUI.Components
         }
         private StringSelector InternalSwitchHandlerImageURLSelector
         {
-            get => new StringSelector(thumb.ResourceUrlSelector);
+            get
+            {
+                Selector<string> resourceUrlSelector = thumb?.ResourceUrlSelector;
+                if (resourceUrlSelector != null)
+                {
+                    return new StringSelector(resourceUrlSelector);
+                }
+                return null;
+            }
             set
             {
                 Debug.Assert(thumb != null);
diff --git a/src/Tizen.NUI/src/internal/FrameBroker/FrameBrokerBase.cs b/src/Tizen.NUI/src/internal/FrameBroker/FrameBrokerBase.cs
index a885179..9212314 100755
--- a/src/Tizen.NUI/src/internal/FrameBroker/FrameBrokerBase.cs
+++ b/src/Tizen.NUI/src/internal/FrameBroker/FrameBrokerBase.cs
@@ -112,8 +112,10 @@ namespace Tizen.NUI
             }
 
             Interop.FrameBroker.ErrorCode err;
-            err = Interop.FrameBroker.SendLaunchRequest(handle, appControl.SafeAppControlHandle, resultCallbackMaps[requestId], null, (IntPtr)requestId);
-
+            lock (resultCallbackMaps)
+            {
+                err = Interop.FrameBroker.SendLaunchRequest(handle, appControl.SafeAppControlHandle, resultCallbackMaps[requestId], null, (IntPtr)requestId);
+            }
             if (err != Interop.FrameBroker.ErrorCode.None)
             {
                 throw FrameBrokerBaseErrorFactory.GetException(err, "Failed to send launch request");
-- 
2.7.4