Received: from malur.postgresql.org ([217.196.149.56])
	by arkaria.postgresql.org with esmtps  (TLS1.3) tls
 TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
	(Exim 4.94.2)
	(envelope-from <pgsql-jdbc-commits-owner+archive@lists.postgresql.org>)
	id 1r0hgY-007GUW-J2
	for pgsql-jdbc-commits@arkaria.postgresql.org;
 Wed, 08 Nov 2023 12:29:30 +0000
Received: from localhost ([127.0.0.1] helo=malur.postgresql.org)
	by malur.postgresql.org with esmtp (Exim 4.94.2)
	(envelope-from <pgsql-jdbc-commits-owner+archive@lists.postgresql.org>)
	id 1r0hgX-0038p5-8L
	for pgsql-jdbc-commits@arkaria.postgresql.org;
 Wed, 08 Nov 2023 12:29:29 +0000
Received: from makus.postgresql.org ([2001:4800:3e1:1::229])
	by malur.postgresql.org with esmtps  (TLS1.3) tls
 TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
	(Exim 4.94.2)
	(envelope-from <noreply@github.com>)
	id 1r0hgX-0038oq-0N
	for pgsql-jdbc-commits@lists.postgresql.org; Wed, 08 Nov 2023 12:29:29 +0000
Received: from out-24.smtp.github.com ([192.30.252.207])
	by makus.postgresql.org with esmtps  (TLS1.3) tls
 TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
	(Exim 4.94.2)
	(envelope-from <noreply@github.com>)
	id 1r0hgU-004Yvt-DU
	for pgsql-jdbc-commits@lists.postgresql.org; Wed, 08 Nov 2023 12:29:27 +0000
Received: from github.com (hubbernetes-node-b157052.ac4-iad.github.net
 [10.52.205.17])
	by smtp.github.com (Postfix) with ESMTPA id F04D51E04DE
	for <pgsql-jdbc-commits@lists.postgresql.org>;
 Wed,  8 Nov 2023 04:29:24 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=github.com;
	s=pf2023; t=1699446565;
	bh=YukuaiIaWdnVN/9g9pVNy/2WVLJta3bhkero3pNHpyo=;
	h=Date:From:To:Subject:From;
	b=b4XbwYDe9wpcA3X/ZB+exDP4FQzRoh7nMB3aZBp0gcwjq692hkPIer4c0kGInoa9O
	 lbXz2IA7SEAmsxP9Q3+php35DcmBKx89Jna0ULZqwofk0yjUzuUYjf4VQKNp4Wih4R
	 IWJ4ZfiYRK2GCrdRxcmcVlY2OrxJ1r+d80acoMSg=
Date: Wed, 08 Nov 2023 04:29:24 -0800
From: George Gastaldi <noreply@github.com>
To: pgsql-jdbc-commits@lists.postgresql.org
Message-ID: <pgjdbc/pgjdbc/push/refs/heads/master/9cf9f3-20d3e0@github.com>
Subject: [pgjdbc/pgjdbc] 20d3e0: Include currentXid in "Error rolling back
 prepared...
Mime-Version: 1.0
Content-Type: text/plain;
 charset=UTF-8
Content-Transfer-Encoding: 7bit
Approved: 58GruLoMopuc
X-GitHub-Recipient-Address: pgsql-jdbc-commits@lists.postgresql.org
X-Auto-Response-Suppress: All
List-Id: <pgsql-jdbc-commits.lists.postgresql.org>
List-Help: <https://lists.postgresql.org/manage/>
List-Subscribe: <https://lists.postgresql.org/manage/>
List-Post: <mailto:pgsql-jdbc-commits@lists.postgresql.org>
List-Owner: <mailto:pgsql-jdbc-commits-owner@lists.postgresql.org>
List-Archive: <https://www.postgresql.org/list/pgsql-jdbc-commits>
Archived-At: 
 <https://www.postgresql.org/message-id/pgjdbc/pgjdbc/push/refs/heads/master/9cf9f3-20d3e0%40github.com>
Precedence: bulk

  Branch: refs/heads/master
  Home:   https://github.com/pgjdbc/pgjdbc
  Commit: 20d3e06a5fdb53498cf4e218c09cd272d95f9092
      https://github.com/pgjdbc/pgjdbc/commit/20d3e06a5fdb53498cf4e218c09cd272d95f9092
  Author: George Gastaldi <gegastaldi@gmail.com>
  Date:   2023-11-08 (Wed, 08 Nov 2023)

  Changed paths:
    M pgjdbc/src/main/java/org/postgresql/xa/PGXAConnection.java

  Log Message:
  -----------
  Include currentXid in "Error rolling back prepared transaction" exception message (#2978)

This fixes the `currentXid={2}` in the PGXAException exception messages