Author: sebb
Date: Mon Oct 3 12:12:01 2011
New Revision: 1178380
URL: http://svn.apache.org/viewvc?rev=1178380&view=rev
Log:
Bug 51937 - JMeter does not handle missing TestPlan entry well
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java?rev=1178380&r1=1178379&r2=1178380&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
Mon Oct 3 12:12:01 2011
@@ -171,6 +171,16 @@ public class StandardJMeterEngine implem
}
public void configure(HashTree testTree) {
+ // Is testplan serialised?
+ SearchByClass<TestPlan> testPlan = new
SearchByClass<TestPlan>(TestPlan.class);
+ testTree.traverse(testPlan);
+ Object[] plan = testPlan.getSearchResults().toArray();
+ if (plan.length == 0) {
+ throw new RuntimeException("Could not find the TestPlan class!");
+ }
+ if (((TestPlan) plan[0]).isSerialized()) {
+ serialized = true;
+ }
active = true;
test = testTree;
}
@@ -311,17 +321,6 @@ public class StandardJMeterEngine implem
log.info("Running the test!");
running = true;
- SearchByClass<TestPlan> testPlan = new
SearchByClass<TestPlan>(TestPlan.class);
- test.traverse(testPlan);
- Object[] plan = testPlan.getSearchResults().toArray();
- if (plan.length == 0) {
- System.err.println("Could not find the TestPlan!");
- log.error("Could not find the TestPlan!");
- System.exit(1);
- }
- if (((TestPlan) plan[0]).isSerialized()) {
- serialized = true;
- }
JMeterContextService.startTest();
try {
PreCompiler compiler = new PreCompiler();
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=1178380&r1=1178379&r2=1178380&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Mon Oct 3 12:12:01 2011
@@ -35,6 +35,7 @@ Earlier changes are detailed in the <a h
<li>Bug 51932 - CacheManager does not handle cache-control header with any
attributes after max-age</li>
<li>Bug 51918 - GZIP compressed traffic produces errors, when multiple
connections allowed</li>
<li>[Non-func] fixes to build.xml: support scripts; localise re-usable
property names</li>
+<li>Bug 51937 - JMeter does not handle missing TestPlan entry well</li>
</ul>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
