From 23b6bfb22a43f1d91c29cce2aad641889367087f Mon Sep 17 00:00:00 2001
From: Fang Xiaohui <xiaohui.fang@samsung.com>
Date: Wed, 16 Jun 2021 17:34:23 +0800
Subject: [PATCH] [NUI][EXaml] Fix issue of xFactory method

---
 src/Tizen.NUI/src/internal/EXaml/Action/CreateInstanceAction.cs | 1 +
 src/Tizen.NUI/src/internal/EXaml/Action/GetValueAction.cs       | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Tizen.NUI/src/internal/EXaml/Action/CreateInstanceAction.cs b/src/Tizen.NUI/src/internal/EXaml/Action/CreateInstanceAction.cs
index d1d0863..52b20ed 100755
--- a/src/Tizen.NUI/src/internal/EXaml/Action/CreateInstanceAction.cs
+++ b/src/Tizen.NUI/src/internal/EXaml/Action/CreateInstanceAction.cs
@@ -86,6 +86,7 @@ namespace Tizen.NUI.EXaml
                 else
                 {
                     int xFactoryMethodIndex = (null == getXFactoryMethodIndexOp) ? -1 : (int)getXFactoryMethodIndexOp.ValueList[0];
+                    getXFactoryMethodIndexOp = null;
 
                     if (null == getParamListOp)
                     {
diff --git a/src/Tizen.NUI/src/internal/EXaml/Action/GetValueAction.cs b/src/Tizen.NUI/src/internal/EXaml/Action/GetValueAction.cs
index ee46105..481a212 100755
--- a/src/Tizen.NUI/src/internal/EXaml/Action/GetValueAction.cs
+++ b/src/Tizen.NUI/src/internal/EXaml/Action/GetValueAction.cs
@@ -152,7 +152,14 @@ namespace Tizen.NUI.EXaml
                 switch (sign)
                 {
                     case '\"':
-                        Value = GetValueByStrings[0](valueString);
+                        if (null == valueString)
+                        {
+                            Value = "";
+                        }
+                        else
+                        {
+                            Value = GetValueByStrings[0](valueString);
+                        }
                         break;
 
                     case 'z':
-- 
2.7.4