Improved null check that also compile.

Orckestra · Sep 30, 2019 · a5026f0 · burningice2866 · Oct 2, 2019 · a5026f0
1 parent f9b0bd0
commit a5026f0
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/Composite/C1Console/Actions/ActionLockingFacade.cs b/Composite/C1Console/Actions/ActionLockingFacade.cs
@@ -416,7 +416,10 @@ private static string GetLockKey(EntityToken entityToken)
             if (entityToken is DataEntityToken)
             {
                 var dataEntityToken = entityToken as DataEntityToken;
-                lockKey = lockKey + (dataEntityToken.DataSourceId.LocaleScope ?? "").ToString();
+                if (dataEntityToken.DataSourceId != null && dataEntityToken.DataSourceId.LocaleScope != null)
+                {
+                    lockKey = lockKey + dataEntityToken.DataSourceId.LocaleScope.ToString();
+                }
             }
 
             return lockKey;