Fix up a few CodqQL scanner errors.

OpenSim-NGC · Nov 9, 2023 · 646b345 · 646b345
1 parent 781523f
commit 646b345
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/OpenSim/Framework/VersionInfo.cs b/OpenSim/Framework/VersionInfo.cs
@@ -39,7 +39,7 @@ public class VersionInfo
     {
         public const string VersionNumber = "0.9.2.2";
         public const string AssemblyVersionNumber = "0.9.2.2";
-        public const string Release = "8709";
+        public const string Release = "8711";
 
         public static string Version
         {

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -5923,7 +5923,6 @@ public int AddOrUpdateLinksetDataKey(string key, string value, string pass)
                 {
                     // Abort.
                     LinksetData[key] = original;
-                    pd = null;
                     updateLinksetDataAccounting();
                     return 1;
                 }
@@ -5985,11 +5984,13 @@ public string[] GetLinksetDataSubList(int start, int count)
         {
             lock (linksetDataLock)
             {
-                if (count == -1) count = LinksetDataKeys;
-                if (LinksetData == null) LinksetData = new Dictionary<string, LinksetDataEntry>();
+                if (count == -1) 
+                    count = LinksetDataKeys;
+
+                if (LinksetData == null) 
+                    LinksetData = new Dictionary<string, LinksetDataEntry>();
 
-                List<string> ret = new List<string>();
-                ret = LinksetData.Keys.Skip(start).Take(count).ToList();
+                List<string> ret = LinksetData.Keys.Skip(start).Take(count).ToList();
                 return ret.ToArray();
             }
         }

diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -846,7 +846,9 @@ private static void ProcessLinksetData(SceneObjectPart obj, XmlReader reader)
             }
             catch 
             {
-
+                m_log.DebugFormat(
+                   "[SceneObjectSerializer]: Exception while processing linksetdata for object part {0} {1}.",
+                   obj.Name, obj.UUID);
             }
         }
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
                 catch
                 {
+                    m_log.DebugFormat(
+                       "[SceneObjectSerializer]: Exception while processing linksetdata for object part {0} {1}.",
+                       obj.Name, obj.UUID);
                 }
             }
@@ Expand Down @@