Merge remote-tracking branch 'github/API4' into tizen_4.0

diff --git a/packaging/csapi-tizenfx.spec b/packaging/csapi-tizenfx.spec
index 030ff39..5c686e0 100644 (file)
--- a/packaging/csapi-tizenfx.spec
+++ b/packaging/csapi-tizenfx.spec
@@ -1,9 +1,9 @@
 # Auto-generated from csapi-tizenfx.spec.in by makespec.sh
 
 %define TIZEN_NET_API_VERSION 4
-%define TIZEN_NET_RPM_VERSION 4.0.1.999
-%define TIZEN_NET_NUGET_VERSION 4.0.1-preview1-99999
-%define TIZEN_NET_INTERNAL_NUGET_VERSION 4.0.1.999
+%define TIZEN_NET_RPM_VERSION 4.0.1.14137+nui401
+%define TIZEN_NET_NUGET_VERSION 4.0.1.14137
+%define TIZEN_NET_INTERNAL_NUGET_VERSION 4.0.1.14137
 
 %define DOTNET_ASSEMBLY_PATH /usr/share/dotnet.tizen/framework
 %define DOTNET_ASSEMBLY_DUMMY_PATH %{DOTNET_ASSEMBLY_PATH}/ref

diff --git a/src/Tizen.Messaging.Push/Tizen.Messaging.Push/PushImpl.cs b/src/Tizen.Messaging.Push/Tizen.Messaging.Push/PushImpl.cs
index 9ba88b3..e38c2e5 100644 (file)
--- a/src/Tizen.Messaging.Push/Tizen.Messaging.Push/PushImpl.cs
+++ b/src/Tizen.Messaging.Push/Tizen.Messaging.Push/PushImpl.cs
@@ -195,6 +195,11 @@ namespace Tizen.Messaging.Push
                     Log.Error(Interop.PushClient.LogTag, "resigterResult is unset");
                     registerResult = null;
                 }
+                lock (_lock)
+                {
+                    Log.Error(Interop.PushClient.LogTag, "resigterResult is unset");
+                    registerResult = null;
+                }
             };
             Interop.PushClient.ServiceError result = Interop.PushClient.ServiceRegister(_connection, registerResult, IntPtr.Zero);
             Log.Info(Interop.PushClient.LogTag, "Interop.PushClient.ServiceRegister Completed");