Attachment #20296 for bug #42326

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




			clearTemporary(property);
		}
		JMeterProperty prop = getProperty(property.getName());
        removeProperty(property.getName());

		if (prop instanceof NullProperty || (prop instanceof StringProperty && prop.getStringValue().equals(""))) {
			propMap.put(property.getName(), property);
		} else {
            propMap.put(property.getName(), prop);
			prop.mergeIn(property);
		}
	}

Return to bug 42326

Lines 214-225 Link Here

(-)AbstractTestElement.java.original (-2 lines)
214	clearTemporary(property);	214	clearTemporary(property);
215	}	215	}
216	JMeterProperty prop = getProperty(property.getName());	216	JMeterProperty prop = getProperty(property.getName());
217	removeProperty(property.getName());
218		217
219	if (prop instanceof NullProperty \|\| (prop instanceof StringProperty && prop.getStringValue().equals(""))) {	218	if (prop instanceof NullProperty \|\| (prop instanceof StringProperty && prop.getStringValue().equals(""))) {
220	propMap.put(property.getName(), property);	219	propMap.put(property.getName(), property);
221	} else {	220	} else {
222	propMap.put(property.getName(), prop);
223	prop.mergeIn(property);	221	prop.mergeIn(property);
224	}	222	}
225	}	223	}