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

(-)C:/Documents and Settings/alf.hogemark/workspace/Jmeter 2.2 official/src/core/org/apache/jmeter/control/LoopController.java (-11 / +13 lines)
Lines 78-94 Link Here
78
		return getPropertyAsBoolean(CONTINUE_FOREVER);
78
		return getPropertyAsBoolean(CONTINUE_FOREVER);
79
	}
79
	}
80
80
81
	/*
81
    /*
82
	 * (non-Javadoc)
82
     * (non-Javadoc)
83
	 * 
83
     * 
84
	 * @see org.apache.jmeter.control.Controller#isDone()
84
     * @see org.apache.jmeter.control.Controller#next()
85
	 */
85
     */
86
	public boolean isDone() {
86
    public Sampler next() {
87
		if (getLoops() != 0) {
87
        if(endOfLoop()) {
88
			return super.isDone();
88
            return null;
89
		}
89
        }
90
		return true;
90
        else {
91
	}
91
            return super.next();
92
        }
93
    }
92
94
93
	private boolean endOfLoop() {
95
	private boolean endOfLoop() {
94
		return (getLoops() > -1) && loopCount >= getLoops();
96
		return (getLoops() > -1) && loopCount >= getLoops();

Return to bug 40851