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

(-)D:/Development/Eclipse/Workspace/jmeter/src/components/org/apache/jmeter/control/ForeachController.java (-5 / +5 lines)
Lines 95-103 Link Here
95 
	public boolean isDone() {
 95 
	public boolean isDone() {
96 
		JMeterContext context = getThreadContext();
 96 
		JMeterContext context = getThreadContext();
97 
		String inputVariable = getInputVal() + getSeparator() + (loopCount + 1);
 97 
		String inputVariable = getInputVal() + getSeparator() + (loopCount + 1);
98 
		if (context.getVariables().get(inputVariable) != null) {
 98 
		if (context.getVariables().getObject(inputVariable) != null) {
99 
			context.getVariables().put(getReturnVal(), context.getVariables().get(inputVariable));
 99 
			context.getVariables().putObject(getReturnVal(), context.getVariables().getObject(inputVariable));
100 
			log.debug("ForEach resultstring isDone=" + context.getVariables().get(getReturnVal()));
 100 
			log.debug("ForEach resultstring isDone=" + context.getVariables().getObject(getReturnVal()));
101 
			return false;
 101 
			return false;
102 
		}
 102 
		}
103 
		return super.isDone();
 103 
		return super.isDone();
Lines 106-112 Link Here
106 
	private boolean endOfArguments() {
 106 
	private boolean endOfArguments() {
107 
		JMeterContext context = getThreadContext();
 107 
		JMeterContext context = getThreadContext();
108 
		String inputVariable = getInputVal() + getSeparator() + (loopCount + 1);
 108 
		String inputVariable = getInputVal() + getSeparator() + (loopCount + 1);
109 
		if (context.getVariables().get(inputVariable) != null) {
 109 
		if (context.getVariables().getObject(inputVariable) != null) {
110 
			log.debug("ForEach resultstring eofArgs= false");
 110 
			log.debug("ForEach resultstring eofArgs= false");
111 
			return false;
 111 
			return false;
112 
		}
 112 
		}
Lines 131-137 Link Here
131 
	private boolean emptyList() {
 131 
	private boolean emptyList() {
132 
		JMeterContext context = getThreadContext();
 132 
		JMeterContext context = getThreadContext();
133 
		String inputVariable = getInputVal() + getSeparator() + "1";
 133 
		String inputVariable = getInputVal() + getSeparator() + "1";
134 
		if (context.getVariables().get(inputVariable) != null) {
 134 
		if (context.getVariables().getObject(inputVariable) != null) {
135 
			return false;
 135 
			return false;
136 
		}
 136 
		}
137 
		log.debug("No entries found - null first entry: " + inputVariable);
 137 
		log.debug("No entries found - null first entry: " + inputVariable);

Return to bug 40099