You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2005/10/10 00:07:37 UTC
cvs commit: jakarta-jmeter/src/components/org/apache/jmeter/control ModuleController.java
sebb 2005/10/09 15:07:37
Modified: src/components/org/apache/jmeter/control Tag: rel-2-1
ModuleController.java
Log:
Avoid NPE when no module is selected
Revision Changes Path
No revision
No revision
1.10.2.2 +11 -9 jakarta-jmeter/src/components/org/apache/jmeter/control/ModuleController.java
Index: ModuleController.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/control/ModuleController.java,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -r1.10.2.1 -r1.10.2.2
--- ModuleController.java 7 Sep 2005 01:31:55 -0000 1.10.2.1
+++ ModuleController.java 9 Oct 2005 22:07:37 -0000 1.10.2.2
@@ -154,13 +154,15 @@
* The current tree under which the nodes will be added
*/
public HashTree getReplacementSubTree() {
- if (!selectedNode.isEnabled()) {
- selectedNode = cloneTreeNode(selectedNode);
- selectedNode.setEnabled(true);
- }
- HashTree tree = new ListedHashTree();
- tree.add(selectedNode);
- createSubTree(tree, selectedNode);
+ HashTree tree = new ListedHashTree();
+ if (selectedNode != null) {
+ if (!selectedNode.isEnabled()) {
+ selectedNode = cloneTreeNode(selectedNode);
+ selectedNode.setEnabled(true);
+ }
+ tree.add(selectedNode);
+ createSubTree(tree, selectedNode);
+ }
return tree;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org