Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@activemq.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1034430 -
 /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/TransactionContext.java
Date: Fri, 12 Nov 2010 15:39:37 -0000
To: commits@activemq.apache.org
From: bsnyder@apache.org
Message-Id: <20101112153937.7631A23889F7@eris.apache.org>

Author: bsnyder
Date: Fri Nov 12 15:39:37 2010
New Revision: 1034430

URL: http://svn.apache.org/viewvc?rev=1034430&view=rev
Log:
AMQ-3022 - Reverting changes for transaction suspend/resume due to broken tests

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/TransactionContext.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/TransactionContext.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/TransactionContext.java?rev=1034430&r1=1034429&r2=1034430&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/TransactionContext.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/TransactionContext.java Fri Nov 12 15:39:37 2010
@@ -164,7 +164,7 @@ public class TransactionContext implemen
         } catch (Throwable e) {
             throw JMSExceptionSupport.create(e);
         } finally {
-        	synchronizations = null;
+            synchronizations = null;
         }
     }
 
@@ -334,17 +334,12 @@ public class TransactionContext implemen
             throw new XAException(XAException.XAER_PROTO);
         }
 
-        String txSuspendResumeNotSupportMsg = "The suspend/resume of a transaction " 
-        	+ "is not supported. Instead it is recommended that a new JMS session be created.";
-        
-        if ((flags & TMJOIN) == TMJOIN) {
-        	throw new XAException(txSuspendResumeNotSupportMsg);
+        // if ((flags & TMJOIN) == TMJOIN) {
         // TODO: verify that the server has seen the xid
-        }
-        if ((flags & TMRESUME) == TMRESUME) {
-        	throw new XAException(txSuspendResumeNotSupportMsg);
-        // TODO: verify that the xid was suspended.
-        }
+        // // }
+        // if ((flags & TMJOIN) == TMRESUME) {
+        // // TODO: verify that the xid was suspended.
+        // }
 
         // associate
         synchronizations = null;
@@ -705,20 +700,20 @@ public class TransactionContext implemen
      * @return the response
      */
     private Response syncSendPacketWithInterruptionHandling(Command command) throws JMSException {
-    	try {
-			return this.connection.syncSendPacket(command);
-		} catch (JMSException e) {
-			if (e.getLinkedException() instanceof InterruptedIOException) {
-				try {
-					Thread.interrupted();
-					return this.connection.syncSendPacket(command);
-				} finally {
-					Thread.currentThread().interrupt();
-				}				
-			}
-			
-			throw e;
-		}
+        try {
+            return this.connection.syncSendPacket(command);
+        } catch (JMSException e) {
+            if (e.getLinkedException() instanceof InterruptedIOException) {
+                try {
+                    Thread.interrupted();
+                    return this.connection.syncSendPacket(command);
+                } finally {
+                    Thread.currentThread().interrupt();
+                }               
+            }
+            
+            throw e;
+        }
     }
 
     /**