[teiid-commits] teiid SVN: r3837 - branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2012-02-01 11:13:49 -0500 (Wed, 01 Feb 2012)
New Revision: 3837

Modified:
   branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java
Log:
TEIID-1921 fix for suspend/resume when using the local connection

Modified: branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java
===================================================================
--- branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java	2012-01-31 18:11:54 UTC (rev 3836)
+++ branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java	2012-02-01 16:13:49 UTC (rev 3837)
@@ -348,13 +348,17 @@
 	}
 
 	private void resume() throws XATransactionException {
-		if (this.transactionState == TransactionState.ACTIVE && this.transactionContext.getTransaction() != null) {
+		if (this.transactionState == TransactionState.ACTIVE && isSuspendable()) {
 			this.transactionService.resume(this.transactionContext);
 		}
 	}
 
+	private boolean isSuspendable() {
+		return !this.useCallingThread && this.transactionContext.getTransaction() != null;
+	}
+
 	private void suspend() {
-		if ((this.transactionState != TransactionState.NONE) && this.transactionContext.getTransaction() != null) {
+		if (this.transactionState != TransactionState.NONE && isSuspendable()) {
 			try {
 				this.transactionService.suspend(this.transactionContext);
 			} catch (XATransactionException e) {