From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001 From: Daniel Baumann <daniel.baumann@progress-linux.org> Date: Fri, 19 Apr 2024 03:13:33 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org> --- devtools/shared/commands/object/object-command.js | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'devtools/shared/commands/object') diff --git a/devtools/shared/commands/object/object-command.js b/devtools/shared/commands/object/object-command.js index 0396b6167a..5812f31148 100644 --- a/devtools/shared/commands/object/object-command.js +++ b/devtools/shared/commands/object/object-command.js @@ -21,10 +21,6 @@ class ObjectCommand { * List of fronts for the object to release. */ async releaseObjects(frontsToRelease) { - // @backward-compat { version 123 } A new Objects Manager front has a new "releaseActors" method. - // Only supportsReleaseActors=true codepath can be kept once 123 is the release channel. - const { supportsReleaseActors } = this.#commands.client.mainRoot.traits; - // First group all object fronts per target const actorsPerTarget = new Map(); const promises = []; @@ -40,20 +36,14 @@ class ObjectCommand { actorIDsToRemove = []; actorsPerTarget.set(targetFront, actorIDsToRemove); } - if (supportsReleaseActors) { - actorIDsToRemove.push(frontToRelease.actorID); - frontToRelease.destroy(); - } else { - promises.push(frontToRelease.release()); - } + actorIDsToRemove.push(frontToRelease.actorID); + frontToRelease.destroy(); } - if (supportsReleaseActors) { - // Then release all fronts by bulk per target - for (const [targetFront, actorIDs] of actorsPerTarget) { - const objectsManagerFront = await targetFront.getFront("objects-manager"); - promises.push(objectsManagerFront.releaseObjects(actorIDs)); - } + // Then release all fronts by bulk per target + for (const [targetFront, actorIDs] of actorsPerTarget) { + const objectsManagerFront = await targetFront.getFront("objects-manager"); + promises.push(objectsManagerFront.releaseObjects(actorIDs)); } await Promise.all(promises); -- cgit v1.2.3