Resolve errors

Author: brrichards

packages/dds/tree/src/shared-tree/treeCheckout.ts

@@ -623,20 +623,17 @@ export class TreeCheckout implements ITreeCheckoutFork {
 
 	private readonly onAfterChange = (event: SharedTreeBranchChange<SharedTreeChange>): void => {
 		this.editLock.lock();
-		try {
-			this.#events.emit("beforeBatch", event);
-			if (event.change !== undefined) {
-				const revision =
-					event.type === "rebase"
-						? this.#transaction.activeBranch.getHead().revision
-						: event.change.revision;
-
-				this.applyChange(event.change.change, revision);
-			}
-			this.#events.emit("afterBatch");
-		} finally {
-			this.editLock.unlock();
+		this.#events.emit("beforeBatch", event);
+		if (event.change !== undefined) {
+			const revision =
+				event.type === "rebase"
+					? this.#transaction.activeBranch.getHead().revision
+					: event.change.revision;
+
+			this.applyChange(event.change.change, revision);
 		}
+		this.#events.emit("afterBatch");
+		this.editLock.unlock();
 		if (event.type === "append") {
 			for (const commit of event.newCommits) {
 				this.validateCommit(commit);

packages/dds/tree/src/test/shared-tree/treeCheckout.spec.ts

@@ -782,30 +782,6 @@ describe("sharedTreeView", () => {
 			view.checkout.transaction.abort();
 			assert.equal(view.checkout.transaction.isInProgress(), false);
 		});
-
-		// Regression test for transactions erroneously double lock
-		itView("does not double-lock when event handler throws during transaction", ({ view }) => {
-			Tree.on(view.root, "nodeChanged", () => {
-				throw new Error("Event handler error");
-			});
-
-			let caughtError: unknown;
-			try {
-				Tree.runTransaction(view, () => {
-					view.root.insertAtStart("A"); // This triggers nodeChanged, which throws
-				});
-			} catch (error) {
-				caughtError = error;
-			}
-
-			// We should get the original error, not the double-lock error (0xaa7)
-			assert(caughtError instanceof Error, "Expected an error to be thrown");
-			assert.equal(
-				caughtError.message,
-				"Event handler error",
-				"Expected the original error message, not a double-lock error",
-			);
-		});
 	});
 
 	describe("disposal", () => {