View | Details | Raw Unified | Return to bug 47398
Collapse All | Expand All

(-)src/core/org/apache/jmeter/JMeter.java (-6 / +17 lines)
Lines 736-753 Link Here
736
            // For GUI runs this is done in Start.java
736
            // For GUI runs this is done in Start.java
737
            convertSubTree(tree);
737
            convertSubTree(tree);
738
738
739
            Summariser summer = null;
740
            String summariserName = JMeterUtils.getPropDefault("summariser.name", "");//$NON-NLS-1$
741
            if (summariserName.length() > 0) {
742
                log.info("Creating summariser <" + summariserName + ">");
743
                println("Creating summariser <" + summariserName + ">");
744
                summer = new Summariser(summariserName);
745
            }
746
            
739
            if (logFile != null) {
747
            if (logFile != null) {
740
                ResultCollector logger = new ResultCollector();
748
                ResultCollector logger = new ResultCollector();
741
                logger.setFilename(logFile);
749
                logger.setFilename(logFile);
750
                if (summer != null) {
751
                    logger.setSummariser(summer);
752
                }
742
                tree.add(tree.getArray()[0], logger);
753
                tree.add(tree.getArray()[0], logger);
743
            }
754
            }
744
            String summariserName = JMeterUtils.getPropDefault("summariser.name", "");//$NON-NLS-1$
755
            else {
745
            if (summariserName.length() > 0) {
756
            	// only add Summariser if it can not be shared with the ResultCollector
746
                log.info("Creating summariser <" + summariserName + ">");
757
	            if (summer != null) {
747
                println("Creating summariser <" + summariserName + ">");
758
	                tree.add(tree.getArray()[0], summer);
748
                Summariser summer = new Summariser(summariserName);
759
	            }
749
                tree.add(tree.getArray()[0], summer);
750
            }
760
            }
761
            
751
            List engines = new LinkedList();
762
            List engines = new LinkedList();
752
            tree.add(tree.getArray()[0], new ListenToTest(parent, (remoteStart && remoteStop) ? engines : null));
763
            tree.add(tree.getArray()[0], new ListenToTest(parent, (remoteStart && remoteStop) ? engines : null));
753
            println("Created the tree successfully using "+testFile);
764
            println("Created the tree successfully using "+testFile);

Return to bug 47398