变更

2023-03-31 10:37:15 +08:00
parent 104ddcc34a
commit 783703eb0f
2 changed files with 11 additions and 12 deletions
@@ -264,17 +264,16 @@ class Connection extends Component
 	 * 回收链接
 	 * @throws
 	 */
-	public function release(bool $isMaster)
+	public function release(PDO $PDO, bool $isMaster)
 	{
 		$name = $this->alias($isMaster);
-		if (!Context::hasContext($name)) {
+		if ($isMaster && $PDO->inTransaction()) {
 			return;
 		}
-		$connections = $this->connection;
-		if (($pdo = Context::getContext($name)) instanceof PDO) {
-			$connections->addItem($name, $pdo);
+		$this->connection->addItem($name, $PDO);
+		if ($isMaster) {
+			Context::remove($name);
 		}
-		Context::remove($name);
 	}