From bd95deb992cef209f2e3f09b899c2033f5a04585 Mon Sep 17 00:00:00 2001
From: Nick Burch <nick.burch@quanticate.com>
Date: Tue, 20 Sep 2011 15:14:52 +0000
Subject: [PATCH] ALF-10334 Merge r30652 from 3.4-BUG-FIX to Head

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30653 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../replication/ReplicationServiceIntegrationTest.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/source/java/org/alfresco/repo/replication/ReplicationServiceIntegrationTest.java b/source/java/org/alfresco/repo/replication/ReplicationServiceIntegrationTest.java
index 7dd7cb7716..58b0cda889 100644
--- a/source/java/org/alfresco/repo/replication/ReplicationServiceIntegrationTest.java
+++ b/source/java/org/alfresco/repo/replication/ReplicationServiceIntegrationTest.java
@@ -133,7 +133,7 @@ public class ReplicationServiceIntegrationTest extends TestCase
     {
         if (AlfrescoTransactionSupport.getTransactionReadState() != TxnReadState.TXN_NONE)
         {
-            fail("Dangling transaction detected.");
+            fail("Dangling transaction detected, left by a previous test.");
         }
         
         replicationActionExecutor = (ReplicationActionExecutor) ctx.getBean("replicationActionExecutor");
@@ -239,6 +239,11 @@ public class ReplicationServiceIntegrationTest extends TestCase
         {
             // Ignore
         }
+        
+        if (AlfrescoTransactionSupport.getTransactionReadState() != TxnReadState.TXN_NONE)
+        {
+            fail("Dangling transaction detected, current test failed to tidy up.");
+        }
    }