Ryan's feedback

deephaven · Jan 9, 2024 · 07f6876 · 07f6876
1 parent b5946e1
commit 07f6876
Showing 1 changed file with 2 additions and 11 deletions.
diff --git a/server/src/main/java/io/deephaven/server/session/SessionState.java b/server/src/main/java/io/deephaven/server/session/SessionState.java
@@ -653,22 +653,13 @@ private synchronized void setDependencies(final List<ExportObject<?>> parents) {
             dependentCount = parents.size();
             for (final ExportObject<?> parent : parents) {
                 if (parent != null && !tryManage(parent)) {
+                    // we've failed; let's cleanup already managed parents
+                    forceReferenceCountToZero();
                     alreadyDeadParent = parent;
                     break;
                 }
             }
 
-            if (alreadyDeadParent != null) {
-                // no point in holding references to other parents any longer; we've already failed
-                for (final ExportObject<?> parent : parents) {
-                    if (parent == alreadyDeadParent) {
-                        break;
-                    } else if (parent != null) {
-                        unmanage(parent);
-                    }
-                }
-            }
-
             if (log.isDebugEnabled()) {
                 final Exception e = new RuntimeException();
                 final LogEntry entry =