JDBC-344 FBXADataSource closes ResultSet in managed transaction as if…

… in auto-commit

src/main/org/firebirdsql/jca/FBManagedConnection.java

@@ -585,7 +585,7 @@ public void commit(Xid id, boolean onePhase) throws XAException {
      * The <code>internalCommit</code> method performs the requested commit
      * and may throw a GDSException to be interpreted by the caller.
      * 
-     * @param id
+     * @param xid
      *            a <code>Xid</code> value
      * @param onePhase
      *            a <code>boolean</code> value
@@ -654,15 +654,23 @@ public void end(Xid id, int flags) throws XAException {
         internalEnd(id, flags);
         mcf.notifyEnd(this, id);
         inDistributedTransaction = false;
+
+        try {
+            // This will reset the managed environment of the associated connections and set the transaction coordinator to local
+            // TODO This is a bit of a hack; need to find a better way; this doesn't work with connectionSharing = true
+            setManagedEnvironment(isManagedEnvironment());
+        } catch (ResourceException ex) {
+            throw new FBXAException("Reset of managed state failed", XAException.XAER_RMERR);
+        }
     }
 
     /**
      * The <code>internalEnd</code> method ends the xid as requested if
-     * approprriate and throws a GDSException including the appropriate XA error
+     * appropriate and throws a GDSException including the appropriate XA error
      * code and a message if not. The caller can decode the exception as
      * necessary.
      * 
-     * @param id
+     * @param xid
      *            a <code>Xid</code> value
      * @param flags
      *            an <code>int</code> value
@@ -1114,6 +1122,10 @@ public void start(Xid id, int flags) throws XAException {
             mcf.notifyStart(this, id);
 
             inDistributedTransaction = true;
+
+            // This will reset the managed environment of the associated connections and set the transaction coordinator to managed
+            // TODO This is a bit of a hack; need to find a better way; this doesn't work with connectionSharing = true
+            setManagedEnvironment(isManagedEnvironment());
 
         } catch (GDSException ge) {
             throw new FBXAException(ge.getXAErrorCode());

src/main/org/firebirdsql/jdbc/FBConnection.java

@@ -473,7 +473,7 @@ public synchronized void setManagedEnvironment(boolean managedConnection) throws
         checkValidity();
 
         InternalTransactionCoordinator.AbstractTransactionCoordinator coordinator;
-        if (managedConnection && mc.inTransaction()) {
+        if (managedConnection && mc.inDistributedTransaction()) {
             coordinator = new InternalTransactionCoordinator.ManagedTransactionCoordinator(this);
             this.autoCommit = false;
         } else {