Revert "Attempt to fix hanging transaction locks after various exceptions or BUGCHECK"

This reverts commit bcb6462.

Author: ilya071294

src/jrd/jrd.cpp

@@ -7667,17 +7667,6 @@ void release_attachment(thread_db* tdbb, Jrd::Attachment* attachment, XThreadEns
 
 	attachment->destroyIntlObjects(tdbb);
 
-	{
-		// Destroy transactions and release their locks
-		// before detaching them from the attachment.
-		jrd_tra* next = NULL;
-		for (jrd_tra* tran = attachment->att_transactions; tran; tran = next)
-		{
-			next = tran->tra_next;
-			jrd_tra::destroy(attachment, tran);
-		}
-	}
-
 	attachment->detachLocks();
 
 	LCK_fini(tdbb, LCK_OWNER_attachment);
@@ -7769,6 +7758,15 @@ void release_attachment(thread_db* tdbb, Jrd::Attachment* attachment, XThreadEns
 
 	delete attachment->att_user;
 
+	{
+		jrd_tra* next = NULL;
+		for (jrd_tra* tran = attachment->att_transactions; tran; tran = next)
+		{
+			next = tran->tra_next;
+			jrd_tra::destroy(attachment, tran);
+		}
+	}
+
 	tdbb->setAttachment(NULL);
 	Jrd::Attachment::destroy(attachment);
 }

src/jrd/lck.cpp

@@ -1483,19 +1483,18 @@ Lock::Lock(thread_db* tdbb, USHORT length, lck_t type, void* object, lock_ast_t
 
 Lock::~Lock()
 {
-	// lck_id might be set if exception or bugcheck occurs
-	if (lck_id)
+	fb_assert(lck_id == 0);
+	fb_assert(!lck_attachment.hasData());
+
+	if (lck_attachment || lck_next || lck_prior)
 	{
 #ifdef DEBUG_LCK_LIST
-		if (lck_attachment || lck_next || lck_prior)
-		{
-			gds__log("DEBUG_LCK_LIST: Lock::~Lock(): this 0x%p, attachment 0x%p, lck_type %d, lck_next 0x%p, lck_prior 0x%p",
-				this, lck_attachment ? lck_attachment->getHandle() : NULL,
-				(int) lck_type, lck_next, lck_prior);
-		}
+		gds__log("DEBUG_LCK_LIST: Lock::~Lock(): this 0x%p, attachment 0x%p, lck_type %d, lck_next 0x%p, lck_prior 0x%p",
+			this, lck_attachment ? lck_attachment->getHandle() : NULL,
+			(int) lck_type, lck_next, lck_prior);
 #endif
 
-		LCK_release(JRD_get_thread_data(), this);
+		setLockAttachment(NULL);
 	}
 }
 

src/jrd/tra.cpp

@@ -3790,7 +3790,6 @@ jrd_tra::~jrd_tra()
 		MemoryPool::deletePool(tra_autonomous_pool);
 
 	delete tra_sec_db_context;
-	delete tra_lock;
 }