? xafixes.patch
? xafixes2.patch
Index: org/postgresql/xa/PGXAConnection.java
===================================================================
RCS file: /usr/local/cvsroot/pgjdbc/pgjdbc/org/postgresql/xa/PGXAConnection.java,v
retrieving revision 1.2
diff -c -r1.2 PGXAConnection.java
*** org/postgresql/xa/PGXAConnection.java	29 Oct 2005 18:59:39 -0000	1.2
--- org/postgresql/xa/PGXAConnection.java	30 Oct 2005 19:09:51 -0000
***************
*** 273,279 ****
  
          try
          {
!             if (xid.equals(currentXid))
              {
                  state = STATE_IDLE;
                  currentXid = null;
--- 273,279 ----
  
          try
          {
!             if (currentXid != null && xid.equals(currentXid))
              {
                  state = STATE_IDLE;
                  currentXid = null;
***************
*** 335,341 ****
          try
          {
              // Check preconditions
!             if (currentXid == null || currentXid.equals(xid))
              {
                  // In fact, we don't know if xid is bogus, or if it just wasn't associated with this connection.
                  // Assume it's our fault.
--- 335,341 ----
          try
          {
              // Check preconditions
!             if (currentXid == null || !currentXid.equals(xid))
              {
                  // In fact, we don't know if xid is bogus, or if it just wasn't associated with this connection.
                  // Assume it's our fault.