Index: C:/Documents and Settings/alf/workspace/JMeter 2.2 Official/src/components/org/apache/jmeter/control/TransactionController.java
===================================================================
--- C:/Documents and Settings/alf/workspace/JMeter 2.2 Official/src/components/org/apache/jmeter/control/TransactionController.java	(revision 524590)
+++ C:/Documents and Settings/alf/workspace/JMeter 2.2 Official/src/components/org/apache/jmeter/control/TransactionController.java	(working copy)
@@ -21,6 +21,7 @@
 import java.io.Serializable;
 
 import org.apache.jmeter.samplers.SampleEvent;
+import org.apache.jmeter.samplers.SampleListener;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Sampler;
 import org.apache.jmeter.threads.JMeterContext;
@@ -35,7 +36,7 @@
  * Transaction Controller to measure transaction times
  * 
  */
-public class TransactionController extends GenericController implements Controller, Serializable {
+public class TransactionController extends GenericController implements SampleListener, Controller, Serializable {
 	protected static final Logger log = LoggingManager.getLoggerForClass();
 
 	transient private String threadName;
@@ -43,7 +44,11 @@
 	transient private ListenerNotifier lnf;
 
 	transient private SampleResult res;
+    
+    transient private int calls;
 
+    transient private int noFailingSamples;
+
 	/**
 	 * Creates a Transaction Controller
 	 */
@@ -62,26 +67,25 @@
 		String n = this.getName();
 		log.debug(threadName + " " + n + " " + s);
 	}
-
-	private int calls;
-
+    
 	/**
 	 * @see org.apache.jmeter.control.Controller#next()
 	 */
 	public Sampler next() {
-		Sampler returnValue = null;
 		if (isFirst()) // must be the start of the subtree
 		{
 			log_debug("+++++++++++++++++++++++++++++");
 			calls = 0;
+            noFailingSamples = 0;
 			res = new SampleResult();
+            res.setSampleLabel(getName());
+            // Assume success
+            res.setSuccessful(true);
 			res.sampleStart();
 		}
 
-		calls++;
-
-		returnValue = super.next();
-
+        Sampler returnValue = super.next();
+        
 		if (returnValue == null) // Must be the end of the controller
 		{
 			log_debug("-----------------------------" + calls);
@@ -89,11 +93,10 @@
 				log_debug("already called");
 			} else {
 				res.sampleEnd();
-				res.setSuccessful(true);
-				res.setSampleLabel(getName());
-				res.setResponseCodeOK();
-				res.setResponseMessage("Called: " + calls);
-				res.setThreadName(threadName);
+                res.setResponseMessage("Number of samples in transaction : " + calls + ", number of failing samples : " + noFailingSamples);
+                if(res.isSuccessful()) {
+                    res.setResponseCodeOK();
+                }
 
 				// TODO could these be done earlier (or just once?)
                 JMeterContext threadContext = getThreadContext();
@@ -103,12 +106,38 @@
 				if (pack == null) {
 					log.warn("Could not fetch SamplePackage");
 				} else {
-					lnf.notifyListeners(new SampleEvent(res, getName()), pack.getSampleListeners());
+                    SampleEvent event = new SampleEvent(res, getName());
+                    // We must set res to null now, before sending the event for the transaction,
+                    // so that we can ignore that event in our sampleOccured method 
+                    res = null;
+					lnf.notifyListeners(event, pack.getSampleListeners());
 				}
-				res = null;
 			}
 		}
+        else {
+            // We have sampled one of our children
+            calls++;            
+        }
 
 		return returnValue;
 	}
+    
+    public void sampleOccurred(SampleEvent se) {
+        // Check if we have are still sampling our children
+        if(res != null) {
+            SampleResult sampleResult = se.getResult(); 
+            res.setThreadName(sampleResult.getThreadName());
+            res.setBytes(res.getBytes() + sampleResult.getBytes());
+            if(!sampleResult.isSuccessful()) {
+                res.setSuccessful(false);
+                noFailingSamples++;
+            }
+        }
+    }
+
+    public void sampleStarted(SampleEvent e) {
+    }
+
+    public void sampleStopped(SampleEvent e) {
+    }
 }
Index: C:/Documents and Settings/alf/workspace/JMeter 2.2 Official/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
===================================================================
--- C:/Documents and Settings/alf/workspace/JMeter 2.2 Official/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java	(revision 524590)
+++ C:/Documents and Settings/alf/workspace/JMeter 2.2 Official/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java	(working copy)
@@ -200,7 +200,7 @@
 		addSubResults(currNode, res);
 		// Add any assertion that failed as children of the sample node
 		AssertionResult assertionResults[] = res.getAssertionResults();
-		int assertionIndex = 0;
+		int assertionIndex = currNode.getChildCount();
 		for (int j = 0; j < assertionResults.length; j++) {
 			AssertionResult item = assertionResults[j];
 			
@@ -231,6 +231,17 @@
 
 			treeModel.insertNodeInto(leafNode, currNode, leafIndex++);
 			addSubResults(leafNode, child);
+            // Add any assertion that failed as children of the sample node
+            AssertionResult assertionResults[] = child.getAssertionResults();
+            int assertionIndex = leafNode.getChildCount();
+            for (int j = 0; j < assertionResults.length; j++) {
+                AssertionResult item = assertionResults[j];
+                
+                if (item.isFailure() || item.isError()) {
+                    DefaultMutableTreeNode assertionNode = new DefaultMutableTreeNode(item);
+                    treeModel.insertNodeInto(assertionNode, leafNode, assertionIndex++);
+                }
+            }
 		}
 	}