query logging exception check (#5630)

* Don't inspect the ColumnLogging object if an error was encountered. The error is only relevant if detailed logging is enabled and it will reported later.
LabKey · Jun 29, 2024 · 7e582e9 · 7e582e9
1 parent 9af2048
commit 7e582e9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/api/src/org/labkey/api/data/MaterializedQueryHelper.java b/api/src/org/labkey/api/data/MaterializedQueryHelper.java
@@ -105,11 +105,12 @@ void reset()
         /** return false if we did not acquire the loadingLock */
         boolean load(SQLFragment selectQuery, boolean isSelectInto)
         {
+            boolean lockAquired = false;
             try
             {
                 try
                 {
-                    if (!_loadingLock.tryLock(5, TimeUnit.MINUTES))
+                    if (!(lockAquired = _loadingLock.tryLock(5, TimeUnit.MINUTES)))
                         return false;
                 }
                 catch (InterruptedException x)
@@ -162,7 +163,8 @@ boolean load(SQLFragment selectQuery, boolean isSelectInto)
             }
             finally
             {
-                _loadingLock.unlock();
+                if (lockAquired)
+                    _loadingLock.unlock();
             }
         }
     }

diff --git a/query/src/org/labkey/query/sql/QueryTable.java b/query/src/org/labkey/query/sql/QueryTable.java
@@ -780,9 +780,12 @@ public Set<RelationColumn> getSuggestedColumns(Set<RelationColumn> selected)
             }
 
             ColumnLogging columnLogging = col.getColumnLogging();
-            for (FieldKey fieldKey : columnLogging.getDataLoggingColumns())
+            if (null == columnLogging.getException())
             {
-                addSuggestedColumn(suggested, fieldKey, selectedColumnMap);
+                for (FieldKey fieldKey : columnLogging.getDataLoggingColumns())
+                {
+                    addSuggestedColumn(suggested, fieldKey, selectedColumnMap);
+                }
             }
         }
         suggested.removeAll(selected);