Author: sebb
Date: Sun Apr 9 17:19:43 2006
New Revision: 392855
URL: http://svn.apache.org/viewcvs?rev=392855&view=rev
Log:
Check for null replacement entry (can happen if include file is missing)
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/JMeter.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/AbstractAction.java
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/JMeter.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/JMeter.java?rev=392855&r1=392854&r2=392855&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/JMeter.java
(original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/JMeter.java Sun
Apr 9 17:19:43 2006
@@ -543,9 +543,11 @@
HashTree subTree = tree.getTree(item);
if (subTree != null) {
HashTree replacementTree = rc.getReplacementSubTree();
- convertSubTree(replacementTree);
- tree.replace(item,rc);
- tree.set(rc,replacementTree);
+ if (replacementTree != null) {
+ convertSubTree(replacementTree);
+ tree.replace(item,rc);
+ tree.set(rc,replacementTree);
+ }
} else {
convertSubTree(tree.getTree(item));
}
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/AbstractAction.java
URL:
http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/AbstractAction.java?rev=392855&r1=392854&r2=392855&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/AbstractAction.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/AbstractAction.java
Sun Apr 9 17:19:43 2006
@@ -65,9 +65,11 @@
if (subTree != null) {
HashTree replacementTree =
rc.getReplacementSubTree();
- convertSubTree(replacementTree);
- tree.replace(item,rc);
- tree.set(rc,replacementTree);
+ if (replacementTree != null) {
+ convertSubTree(replacementTree);
+ tree.replace(item,rc);
+ tree.set(rc,replacementTree);
+ }
}
} else {
convertSubTree(tree.getTree(item));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
